dotsync 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62ac42fee1c4a3358014f4b4d9bd8e63794b1815ad1beb5234d6a61f0815b58d
-  data.tar.gz: 3bad18f98f83603d52bbcb6b6278d8b8b5e41ca4386adddfd8303785a9892347
+  metadata.gz: 9b671284dfcdd29739df951c9656b8a0a9867619b57175ac62c5eb6f45137ed0
+  data.tar.gz: 26ee6f58257a4a556ea2a7f1eedc06660743fd47e1e073f1977b0a591a2db7f3
 SHA512:
-  metadata.gz: 8d5db370521fbe7f210f27172d95301ebb182f058c391468359fd51f2aed9d1d2306deddd7911b0cb0b786150155b34667d3611b6aa6c22e606e6e74684f6a0c
-  data.tar.gz: cffff97956e3aaabd2f6de871ac76441a042abd0d7d0d51dc452c73d1c397cec8cf7e4121421bd814e3620cf5a047cbf1060c162e52f56c1d04d15ba23bcb068
+  metadata.gz: a0206e946ca9040ed97d5385c33fea54b0080e824fbe5c3844adac5bc37cdf452e75efd6ebc40ac1f40d66d1bfa52e9f60ec962ab5a247dda0a8acdea15c2235
+  data.tar.gz: 2902acbf3de208132ced6cde1b22f4f3a5a72eacacd6c9c048d3edbf8f20ebf636bf5e7549aec207aba07c642d0a54cf55a6684191a6cb259c66fd31878e32bc

data/CHANGELOG.md

@@ -1,8 +1,12 @@
+# 0.1.6
+
+- Show diff changes on PushAction and PullAction.
+- Fixed load custom config (Icons, Colors)
+
 # 0.1.5
 
 - Fixes backup when destination folder does not exist
-- Add rubocop
-
+- Add rubocop to Github Actions
 
 # 0.1.4
 

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    dotsync (0.1.5)
+    dotsync (0.1.6)
       fileutils (~> 1.7.3)
+      find (~> 0.2.0)
       listen (~> 3.9.0)
       logger (~> 1.7.0)
       ostruct (~> 0.6.3)
@@ -26,6 +27,7 @@ GEM
     ffi (1.17.2-x86_64-linux-gnu)
     ffi (1.17.2-x86_64-linux-musl)
     fileutils (1.7.3)
+    find (0.2.0)
     json (2.15.2)
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
@@ -119,10 +121,10 @@ DEPENDENCIES
   rake (~> 13.3.0)
   rspec (~> 3.13.1)
   rubocop (~> 1.81.1)
-  rubocop-md
-  rubocop-performance
-  rubocop-rake
-  rubocop-rspec
+  rubocop-md (~> 2.0.3)
+  rubocop-performance (~> 1.26.1)
+  rubocop-rake (~> 0.7.1)
+  rubocop-rspec (~> 3.7.0)
   ruby-lsp (~> 0.26.1)
   timecop (~> 0.9.10)
 

data/dotsync.gemspec

@@ -32,13 +32,14 @@ Gem::Specification.new do |spec|
   spec.add_dependency "fileutils", "~> 1.7.3"
   spec.add_dependency "logger", "~> 1.7.0" # No longer part of default gems from Ruby 3.5
   spec.add_dependency "ostruct", "~> 0.6.3" # No longer part of default gems from Ruby 3.5
+  spec.add_dependency "find", "~> 0.2.0"
   spec.add_development_dependency "rake", "~> 13.3.0"
   spec.add_development_dependency "rspec", "~> 3.13.1"
   spec.add_development_dependency "rubocop", "~> 1.81.1"
-  spec.add_development_dependency "rubocop-rspec"
-  spec.add_development_dependency "rubocop-performance"
-  spec.add_development_dependency "rubocop-rake"
-  spec.add_development_dependency "rubocop-md"
+  spec.add_development_dependency "rubocop-rspec", "~> 3.7.0"
+  spec.add_development_dependency "rubocop-performance", "~> 1.26.1"
+  spec.add_development_dependency "rubocop-rake", "~> 0.7.1"
+  spec.add_development_dependency "rubocop-md", "~> 2.0.3"
   spec.add_development_dependency "timecop", "~> 0.9.10"
   spec.add_development_dependency "ruby-lsp", "~> 0.26.1"
 end

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

@@ -14,6 +14,21 @@ module Dotsync
       end
     end
 
+    def show_changes
+      diffs = valid_mappings.map do |mapping|
+        Dotsync::DirectoryDiffer.new(mapping).diff
+      end
+      diffs.flat_map(&:additions).sort.each do |path|
+        logger.log("  #{path}", color: Dotsync::Colors.diff_additions)
+      end
+      diffs.flat_map(&:modifications).sort.each do |path|
+        logger.log("  #{path}", color: Dotsync::Colors.diff_modifications)
+      end
+      diffs.flat_map(&:removals).sort.each do |path|
+        logger.log("  #{path}", color: Dotsync::Colors.diff_removals)
+      end
+    end
+
     def transfer_mappings
       valid_mappings.each do |mapping|
         Dotsync::FileTransfer.new(mapping).transfer

data/lib/dotsync/actions/pull_action.rb

@@ -8,6 +8,7 @@ module Dotsync
 
     def execute
       show_config
+      show_changes
       if create_backup
         show_backup
         purge_old_backups

data/lib/dotsync/actions/push_action.rb

@@ -6,6 +6,7 @@ module Dotsync
 
     def execute
       show_config
+      show_changes
       push_dotfiles
     end
 

data/lib/dotsync/colors.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Dotsync
+  module Colors
+    DEFAULT_DIFF_ADDITIONS = 34
+    DEFAULT_DIFF_MODIFICATIONS = 36
+    DEFAULT_DIFF_REMOVALS = 88
+
+    @custom_colors = {}
+
+    def self.load_custom_colors(config)
+      @custom_colors = {
+        diff_additions: config.dig("colors", "diff_additions") || DEFAULT_FORCE,
+        diff_modifications: config.dig("colors", "diff_modifications") || DEFAULT_IGNORE,
+        diff_removals: config.dig("colors", "diff_removals") || DEFAULT_INVALID
+      }
+    end
+
+    def self.diff_additions
+      @custom_colors[:additions] || DEFAULT_DIFF_ADDITIONS
+    end
+
+    def self.diff_modifications
+      @custom_colors[:modifications] || DEFAULT_DIFF_MODIFICATIONS
+    end
+
+    def self.diff_removals
+      @custom_colors[:removals] || DEFAULT_DIFF_REMOVALS
+    end
+
+    MAPPINGS = {
+      diff_additions: -> { diff_additions },
+      diff_modifications: -> { diff_modifications },
+      diff_removals: -> { diff_removals }
+    }
+  end
+end

data/lib/dotsync/{actions/config → config}/pull_action_config.rb

@@ -6,7 +6,7 @@ module Dotsync
 
     def mappings
       mappings_list = section["mappings"]
-      Array(mappings_list).map { |mapping| Dotsync::MappingEntry.new(mapping) }
+      Array(mappings_list).map { |mapping| Dotsync::Mapping.new(mapping) }
     end
 
     def backups_root

data/lib/dotsync/{actions/config → config}/push_action_config.rb

@@ -4,7 +4,7 @@ module Dotsync
   class PushActionConfig < BaseConfig
     def mappings
       mappings_list = section["mappings"]
-      Array(mappings_list).map { |mapping| Dotsync::MappingEntry.new(mapping) }
+      Array(mappings_list).map { |mapping| Dotsync::Mapping.new(mapping) }
     end
 
     private

data/lib/dotsync/errors.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
 module Dotsync
+  class Error < StandardError; end
   class ConfigError < StandardError; end
 end

data/lib/dotsync/icons.rb

@@ -9,7 +9,7 @@ module Dotsync
     # Configuration icon
     CONFIG = " "
 
-    # Default MappingEntry icons
+    # Default Mapping icons
     DEFAULT_FORCE = "󰁪 "
     DEFAULT_IGNORE = "󰈉 "
     DEFAULT_INVALID = "󱏏 "

data/lib/dotsync/models/diff.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Dotsync
+  # Represents the differences between two directories
+  class Diff
+    attr_reader :additions, :modifications, :removals
+
+    def initialize(additions: [], modifications: [], removals: [])
+      @additions = additions
+      @modifications = modifications
+      @removals = removals
+    end
+
+    def empty?
+      @additions.empty? && @modifications.empty? && @removals.empty?
+    end
+  end
+end

data/lib/dotsync/{actions/config/mapping_entry.rb → models/mapping.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Dotsync
-  class MappingEntry
+  class Mapping
     include Dotsync::PathUtils
 
     attr_reader :original_src, :original_dest, :original_ignores
@@ -66,7 +66,7 @@ module Dotsync
         path
       end
 
-      Dotsync::MappingEntry.new(
+      Dotsync::Mapping.new(
         "src" => File.join(@original_src, relative_path),
         "dest" => File.join(@original_dest, relative_path),
         "force" => @force,

data/lib/dotsync/runner.rb

@@ -17,7 +17,11 @@ module Dotsync
           config_class = Dotsync.const_get("#{camelize(action_name.to_s)}ActionConfig")
 
           config = config_class.new(Dotsync.config_path)
+          Dotsync::Icons.load_custom_icons(config)
+          Dotsync::Colors.load_custom_colors(config)
+
           action = action_class.new(config, @logger)
+
           action.execute
         rescue ConfigError => e
           @logger.error("[#{action_name}] config error:")

data/lib/dotsync/utils/directory_differ.rb

@@ -0,0 +1,111 @@
+# frozen_string_literal: true
+
+module Dotsync
+  # Usage:
+  # differ = DirectoryDiffer.new("/path/to/src", "/path/to/dest")
+  # differences = differ.diff
+  class DirectoryDiffer
+    attr_reader :src, :dest
+
+    # Initializes a new DirectoryDiffer.
+    #
+    # @param mapping [Dotsync::Mapping] the mapping object containing source, destination, force, and ignore details
+    # @option mapping [String] :src the source directory path
+    # @option mapping [String] :dest the destination directory path
+    # @option mapping [Boolean] :force? optional flag to force actions
+    # @option mapping [Array<String>] :ignores optional list of files/directories to ignore
+    def initialize(mapping)
+      @src = mapping.src
+      @dest = mapping.dest
+      @force = mapping.force?
+      @ignores = mapping.original_ignores || []
+    end
+
+    def diff
+      additions = []
+      modifications = []
+      removals = []
+
+      Find.find(src) do |src_path|
+        rel_path = src_path.sub(/^#{Regexp.escape(src)}\/?/, "")
+        next if rel_path.empty?
+
+        dest_path = File.join(dest, rel_path)
+
+        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)
+            modifications << rel_path
+          end
+        end
+      end
+
+      if @force
+        Find.find(dest) do |dest_path|
+          rel_path = dest_path.sub(/^#{Regexp.escape(dest)}\/?/, "")
+          next if rel_path.empty?
+
+          src_path = File.join(src, rel_path)
+
+          if !File.exist?(src_path)
+            removals << rel_path
+          end
+        end
+      end
+
+      if @ignores.any?
+        additions = filter_paths(additions, @ignores)
+        modifications = filter_paths(modifications, @ignores)
+        removals = filter_paths(removals, @ignores)
+      end
+
+      Dotsync::Diff.new(additions: additions, modifications: modifications, removals: removals)
+    end
+
+    private
+      def collect_src_diffs
+        diffs = []
+        Find.find(src) do |src_path|
+          rel_path = src_path.sub(/^#{Regexp.escape(src)}\/?/, "")
+          next if rel_path.empty?
+
+          dest_path = File.join(dest, rel_path)
+
+          if !File.exist?(dest_path)
+            diffs << rel_path
+          elsif File.directory?(src_path) && !File.directory?(dest_path)
+            diffs << rel_path
+          elsif File.file?(src_path) && !File.file?(dest_path)
+            diffs << rel_path
+          elsif File.file?(src_path) && File.file?(dest_path)
+            if File.size(src_path) != File.size(dest_path)
+              diffs << rel_path
+            end
+          end
+        end
+        diffs
+      end
+
+      def collect_dest_diffs
+        diffs = []
+        Find.find(dest) do |dest_path|
+          rel_path = dest_path.sub(/^#{Regexp.escape(dest)}\/?/, "")
+          next if rel_path.empty?
+          src_path = File.join(src, rel_path)
+          if !File.exist?(src_path)
+            diffs << rel_path
+          end
+        end
+        diffs
+      end
+
+      def filter_paths(all_paths, ignore_paths)
+        all_paths.reject do |path|
+          ignore_paths.any? do |ignore|
+            path == ignore || path.start_with?("#{ignore}/")
+          end
+        end
+      end
+  end
+end

data/lib/dotsync/{file_transfer.rb → utils/file_transfer.rb}

@@ -4,11 +4,18 @@ module Dotsync
   class FileTransfer
     attr_reader :ignores
 
-    def initialize(config)
-      @src = config.src
-      @dest = config.dest
-      @force = config.force?
-      @ignores = config.ignores || []
+    # Initializes a new FileTransfer instance
+    #
+    # @param mapping [Dotsync::Mapping] the mapping object containing source, destination, force, and ignore details
+    # @option mapping [String] :src the source directory path
+    # @option mapping [String] :dest the destination directory path
+    # @option mapping [Boolean] :force? optional flag to force actions
+    # @option mapping [Array<String>] :ignores optional list of files/directories to ignore
+    def initialize(mapping)
+      @src = mapping.src
+      @dest = mapping.dest
+      @force = mapping.force?
+      @ignores = mapping.ignores || []
     end
 
     def transfer

data/lib/dotsync/version.rb

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

data/lib/dotsync.rb

@@ -7,25 +7,26 @@ require "toml-rb"
 require "logger"
 require "forwardable" # Ruby standard library
 require "ostruct"
-
-# Errors
-require_relative "dotsync/errors"
+require "find"
 
 # Utils
-require_relative "dotsync/icons"
-require_relative "dotsync/logger"
-require_relative "dotsync/file_transfer"
-require_relative "dotsync/path_utils"
+require_relative "dotsync/utils/logger"
+require_relative "dotsync/utils/file_transfer"
+require_relative "dotsync/utils/directory_differ"
+require_relative "dotsync/utils/path_utils"
+
+# Models
+require_relative "dotsync/models/mapping"
+require_relative "dotsync/models/diff"
 
 # Config
-require_relative "dotsync/actions/config/xdg_base_directory_spec"
-require_relative "dotsync/actions/config/mapping_entry"
-require_relative "dotsync/actions/config/base_config"
-require_relative "dotsync/actions/config/pull_action_config"
-require_relative "dotsync/actions/config/push_action_config"
-require_relative "dotsync/actions/config/watch_action_config"
-
-# Concerns
+require_relative "dotsync/config/xdg_base_directory_spec"
+require_relative "dotsync/config/base_config"
+require_relative "dotsync/config/pull_action_config"
+require_relative "dotsync/config/push_action_config"
+require_relative "dotsync/config/watch_action_config"
+
+# Actions Concerns
 require_relative "dotsync/actions/concerns/mappings_transfer"
 
 # Actions
@@ -34,13 +35,14 @@ require_relative "dotsync/actions/pull_action"
 require_relative "dotsync/actions/push_action"
 require_relative "dotsync/actions/watch_action"
 
+# Base classes
+require_relative "dotsync/errors"
+require_relative "dotsync/icons"
+require_relative "dotsync/colors"
 require_relative "dotsync/runner"
-
 require_relative "dotsync/version"
 
 module Dotsync
-  class Error < StandardError; end
-
   class << self
     attr_writer :config_path
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dotsync
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - David Sáenz
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.3
+- !ruby/object:Gem::Dependency
+  name: find
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -126,58 +140,58 @@ dependencies:
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.7.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.26.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.26.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: rubocop-md
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.3
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -237,22 +251,25 @@ files:
 - lib/dotsync.rb
 - lib/dotsync/actions/base_action.rb
 - lib/dotsync/actions/concerns/mappings_transfer.rb
-- lib/dotsync/actions/config/base_config.rb
-- lib/dotsync/actions/config/mapping_entry.rb
-- lib/dotsync/actions/config/pull_action_config.rb
-- lib/dotsync/actions/config/push_action_config.rb
-- lib/dotsync/actions/config/watch_action_config.rb
-- lib/dotsync/actions/config/xdg_base_directory_spec.rb
 - lib/dotsync/actions/pull_action.rb
 - lib/dotsync/actions/push_action.rb
 - lib/dotsync/actions/watch_action.rb
+- lib/dotsync/colors.rb
+- lib/dotsync/config/base_config.rb
+- lib/dotsync/config/pull_action_config.rb
+- lib/dotsync/config/push_action_config.rb
+- lib/dotsync/config/watch_action_config.rb
+- lib/dotsync/config/xdg_base_directory_spec.rb
 - lib/dotsync/errors.rb
-- lib/dotsync/file_transfer.rb
 - lib/dotsync/icons.rb
-- lib/dotsync/logger.rb
-- lib/dotsync/path_utils.rb
+- lib/dotsync/models/diff.rb
+- lib/dotsync/models/mapping.rb
 - lib/dotsync/runner.rb
 - lib/dotsync/tasks/actions.rake
+- lib/dotsync/utils/directory_differ.rb
+- lib/dotsync/utils/file_transfer.rb
+- lib/dotsync/utils/logger.rb
+- lib/dotsync/utils/path_utils.rb
 - lib/dotsync/version.rb
 homepage: https://github.com/dsaenztagarro/dotsync
 licenses: