dotsync 0.1.4 → 0.1.6

data/lib/dotsync/actions/push_action.rb

@@ -1,22 +1,24 @@
+# frozen_string_literal: true
+
 module Dotsync
   class PushAction < BaseAction
     include MappingsTransfer
 
     def execute
       show_config
+      show_changes
       push_dotfiles
     end
 
     private
+      def show_config
+        show_mappings
+      end
 
-    def show_config
-      show_mappings
-    end
-
-    def push_dotfiles
-      transfer_mappings
+      def push_dotfiles
+        transfer_mappings
 
-      action("Dotfiles pushed", icon: :copy)
-    end
+        action("Dotfiles pushed", icon: :copy)
+      end
   end
 end

data/lib/dotsync/actions/watch_action.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dotsync
   class WatchAction < BaseAction
     def_delegator :@config, :mappings
@@ -19,7 +21,6 @@ module Dotsync
     end
 
     private
-
       def show_config
         logger.info("Mappings:", icon: :config)
         mappings.each { |mapping| logger.log("  #{mapping}") }

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}/base_config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dotsync
   # BaseConfig serves as an abstract class to define the structure
   # and validation rules for configuration files in the Dotsync system.
@@ -15,7 +17,6 @@ module Dotsync
     end
 
     private
-
       # Validates the configuration file.
       #
       # @raise [NotImplementedError] if not implemented by a subclass.

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

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module Dotsync
   class PullActionConfig < BaseConfig
     include XDGBaseDirectorySpec
 
     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
@@ -12,7 +14,6 @@ module Dotsync
     end
 
     private
-
       SECTION_NAME = "pull"
 
       def section_name

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

@@ -1,12 +1,13 @@
+# frozen_string_literal: true
+
 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
-
       SECTION_NAME = "push"
 
       def section_name

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

@@ -1,8 +1,8 @@
+# frozen_string_literal: true
+
 module Dotsync
   class WatchActionConfig < PushActionConfig
-
     private
-
       SECTION_NAME = "watch"
 
       def section_name

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dotsync
   # https://specifications.freedesktop.org/basedir-spec/latest/
   module XDGBaseDirectorySpec

data/lib/dotsync/errors.rb

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

data/lib/dotsync/icons.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dotsync
   module Icons
     # Log level icons
@@ -7,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,14 +1,16 @@
+# frozen_string_literal: true
+
 module Dotsync
-  class MappingEntry
+  class Mapping
     include Dotsync::PathUtils
 
     attr_reader :original_src, :original_dest, :original_ignores
 
-    def initialize(hash)
-      @original_src = hash["src"]
-      @original_dest = hash["dest"]
-      @original_ignores = Array(hash["ignore"])
-      @force = hash["force"] || false
+    def initialize(attributes)
+      @original_src = attributes["src"]
+      @original_dest = attributes["dest"]
+      @original_ignores = Array(attributes["ignore"])
+      @force = attributes["force"] || false
 
       @sanitized_src = sanitize_path(@original_src)
       @sanitized_dest = sanitize_path(@original_dest)
@@ -32,7 +34,19 @@ module Dotsync
     end
 
     def valid?
-      File.exist?(@sanitized_src) && File.exist?(File.dirname(@sanitized_dest))
+      (File.file?(src) && File.file?(dest)) ||
+      (File.directory?(src) && File.directory?(dest)) ||
+      (File.file?(src) && !File.exist?(dest) && File.directory?(File.dirname(dest)))
+    end
+
+    def backup_possible?
+      valid? && File.exist?(dest)
+    end
+
+    def backup_basename
+      return unless valid?
+      return File.dirname(dest) unless File.exist?(dest)
+      File.basename(dest)
     end
 
     def to_s
@@ -52,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,
@@ -61,10 +75,8 @@ module Dotsync
     end
 
     private
-
-    def ignores?
-      @original_ignores.any?
-    end
+      def ignores?
+        @original_ignores.any?
+      end
   end
 end
-

data/lib/dotsync/runner.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dotsync
   class Runner
     def initialize(logger: nil)
@@ -15,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:")
@@ -32,42 +38,41 @@ module Dotsync
     end
 
     private
+      def setup_config
+        require "toml-rb"
+        require "fileutils"
 
-    def setup_config
-      require 'toml-rb'
-      require 'fileutils'
-
-      config_path = File.expand_path(Dotsync.config_path)
-      FileUtils.mkdir_p(File.dirname(config_path))
+        config_path = File.expand_path(Dotsync.config_path)
+        FileUtils.mkdir_p(File.dirname(config_path))
 
-      example_mappings = {
-        "pull" => {
-          "mappings" => [
-            { "src" => "$DOTFILES_DIR/config/", "dest" => "$XDG_CONFIG_HOME", "force" => false },
-            { "src" => "$DOTFILES_DIR/home/.zshenv", "dest" => "$HOME" }
-          ],
-        },
-        "push" => {
-          "mappings" => [
-            { "src" => "$HOME/.zshenv", "dest" => "$DOTFILES_DIR/home/.zshenv" },
-            { "src" => "$XDG_CONFIG_HOME/alacritty", "dest" => "$DOTFILES_DIR/config/alacritty" }
-          ]
-        },
-        "watch" => {
-          "mappings" => [
-            { "src" => "$HOME/.zshenv", "dest" => "$DOTFILES_DIR/home/.zshenv" },
-            { "src" => "$XDG_CONFIG_HOME/alacritty", "dest" => "$DOTFILES_DIR/config/alacritty" }
-          ]
+        example_mappings = {
+          "pull" => {
+            "mappings" => [
+              { "src" => "$DOTFILES_DIR/config/", "dest" => "$XDG_CONFIG_HOME", "force" => false },
+              { "src" => "$DOTFILES_DIR/home/.zshenv", "dest" => "$HOME" }
+            ],
+          },
+          "push" => {
+            "mappings" => [
+              { "src" => "$HOME/.zshenv", "dest" => "$DOTFILES_DIR/home/.zshenv" },
+              { "src" => "$XDG_CONFIG_HOME/alacritty", "dest" => "$DOTFILES_DIR/config/alacritty" }
+            ]
+          },
+          "watch" => {
+            "mappings" => [
+              { "src" => "$HOME/.zshenv", "dest" => "$DOTFILES_DIR/home/.zshenv" },
+              { "src" => "$XDG_CONFIG_HOME/alacritty", "dest" => "$DOTFILES_DIR/config/alacritty" }
+            ]
+          }
         }
-      }
 
-      File.write(config_path, TomlRB.dump(example_mappings))
-      @logger.info("Configuration file created at #{config_path}")
-    end
+        File.write(config_path, TomlRB.dump(example_mappings))
+        @logger.info("Configuration file created at #{config_path}")
+      end
 
-    # Utility to convert 'pull' to 'Pull', 'sync' to 'Sync', etc.
-    def camelize(str)
-      str.split('_').map(&:capitalize).join
-    end
+      # Utility to convert 'pull' to 'Pull', 'sync' to 'Sync', etc.
+      def camelize(str)
+        str.split("_").map(&:capitalize).join
+      end
   end
 end

data/lib/dotsync/tasks/actions.rake

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 desc "Sync Dotfiles"
 task :sync do
-  ds = Dotsync::SyncAction.new
+  Dotsync::SyncAction.new
 end
 
 desc "Watch Dotfiles"

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/utils/file_transfer.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+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
+    # @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
+      if File.file?(@src)
+        transfer_file(@src, @dest)
+      else
+        FileUtils.rm_rf(Dir.glob(File.join(@dest, "*"))) if @force
+        transfer_folder(@src, @dest)
+      end
+    end
+
+    private
+      def transfer_file(file_src, file_dest)
+        FileUtils.mkdir_p(File.dirname(file_dest))
+        FileUtils.cp(file_src, file_dest)
+      end
+
+      def transfer_folder(folder_src, folder_dest)
+        FileUtils.mkdir_p(folder_dest)
+        Dir.glob("#{folder_src}/*", File::FNM_DOTMATCH).each do |path|
+          next if [".", ".."].include?(File.basename(path))
+
+          full_path = File.expand_path(path)
+          next if ignore?(full_path)
+
+          target = File.join(folder_dest, File.basename(path))
+          if File.file?(full_path)
+            FileUtils.cp(full_path, target)
+          else
+            transfer_folder(full_path, target)
+          end
+        end
+      end
+
+      def ignore?(path)
+        @ignores.any? { |ignore| path.start_with?(ignore) }
+      end
+  end
+end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dotsync
   class Logger
     attr_accessor :output

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dotsync
   module PathUtils
     ENV_VARS_COLOR = 104
@@ -15,8 +17,8 @@ module Dotsync
     # @param [String] path The input path to translate
     # @return [String] The translated path
     def translate_tmp_path(path)
-      if path.start_with?('/tmp') && RUBY_PLATFORM.include?('darwin')
-        path.sub('/tmp', '/private/tmp')
+      if path.start_with?("/tmp") && RUBY_PLATFORM.include?("darwin")
+        path.sub("/tmp", "/private/tmp")
       else
         path
       end

data/lib/dotsync/version.rb

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

data/lib/dotsync.rb

@@ -1,29 +1,32 @@
+# frozen_string_literal: true
+
 # Libs dependencies
-require 'fileutils'
-require 'listen'
-require 'toml-rb'
-require 'logger'
-require 'forwardable' # Ruby standard library
-require 'ostruct'
-
-# Errors
-require_relative "dotsync/errors"
+require "fileutils"
+require "listen"
+require "toml-rb"
+require "logger"
+require "forwardable" # Ruby standard library
+require "ostruct"
+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
@@ -32,18 +35,19 @@ require_relative "dotsync/actions/pull_action"
 require_relative "dotsync/actions/push_action"
 require_relative "dotsync/actions/watch_action"
 
-require_relative 'dotsync/runner'
-
+# 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
 
     def config_path
-      @config_path ||= ENV['DOTSYNC_CONFIG'] || "~/.config/dotsync.toml"
+      @config_path ||= ENV["DOTSYNC_CONFIG"] || "~/.config/dotsync.toml"
     end
   end
 end