lace 0.5.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46881767c22f451c4e42104713158a054acfe41eee483ab2cac43416d8e99738
-  data.tar.gz: b8d483c8695e034ddd022522362b8aaad46a9947c98bf02bd92f9880cbda3280
+  metadata.gz: 0e9374d4a207b650f55ec19e285891ac00fc55da706d5a87b8ce5ff642315f30
+  data.tar.gz: 457594f9250c5e7045a00b227596c41f461a8487e3be6c95240f6891b8067e6e
 SHA512:
-  metadata.gz: 3200530a5a2007710f79508f5027c1caa72bf08377f296a6adb6b94db404a7b6dca9abbcd5dfe7d9e8bc1945741c9f61299e06cbf7e15a5ac74e2ced4d81ee1e
-  data.tar.gz: 0a6019e2cae178f0a276ecc943466445f493b6a30df7f0ae5f36db9a344b2641bfde336cced8e6be47e02b979ed7d749632d6e0057e544a65d21b50f3c219242
+  metadata.gz: f546f2835196c35b71522b3683376c79c3deee6b82529c24108639d44fa148bca4a1127aefcab3d6e38209b8c7cda917a535019fb1f2068db92d06427817b8b2
+  data.tar.gz: 386d3fb4712ad53fe2fc1f06cfa853c1fd552d5a23b0d46fc8160925b62ed5ff09f19ee41d48309ba5ae55bce9eb1964c4b1f6ce65b25507f3615eb0da2fc824

data/bin/lace

@@ -48,7 +48,7 @@ case ARGV.first when '-h', '--help', '--usage', '-?', 'help', nil
   require 'cmd/help'
   puts Lace.help_s
   exit ARGV.first ? 0 : 1
-when '--version'
+when '--version', '-v'
   puts Lace::VERSION
   exit 0
 end

data/lib/cmd/apply.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'lace/package'
+require 'lace/exceptions'
+require 'fileutils'
+
+module Lace
+  module_function
+
+  def apply
+    package_name = ARGV.shift
+    raise ResourceNotSpecified unless package_name
+    ohai "Applying package #{package_name}"
+    package = Package.new(package_name, ARGV.first)
+
+    diff = PackageUtils.diff(package_name)
+
+    if diff.added.empty? && diff.removed.empty?
+      puts 'Everything is already in sync. Nothing to do.'
+      return
+    end
+
+    diff.added.each do |f|
+      dest = f.as_dotfile(Dir.home, package.path)
+      dest_path = dest.to_path.gsub(Dir.home, '$HOME')
+      puts "Link #{f.basename} to #{dest_path}?"
+      next unless ARGV.confirm?("Link #{f.basename} to #{dest_path}?")
+
+      package.link_file_or_directory(f, dest, force: true)
+      ohai "Linked"
+    end
+
+    diff.removed.each do |f|
+      dest = f.as_dotfile(Dir.home, package.path)
+      dest_path = dest.to_path.gsub(Dir.home, '$HOME')
+      next unless ARGV.confirm?("Remove link for #{f.basename} from #{dest_path}?")
+
+      package.unlink_file(f, force: true)
+      ohai "Removed"
+    end
+  end
+end

data/lib/cmd/diff.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'lace/package'
+require 'lace/exceptions'
+
+module Lace
+  module_function
+
+  def diff
+    package_name = ARGV.shift
+    raise ResourceNotSpecified unless package_name
+
+    package = Package.new(package_name, ARGV.first)
+    diff = PackageUtils.diff package_name
+
+    if diff.added.empty? && diff.removed.empty?
+      ohai 'Everything is already in sync.'
+      return
+    end
+
+    ohai 'The following files would be added [+] or removed [-]'
+    diff.added.each do |f|
+      puts "[+] #{f.basename} -> #{f.as_dotfile(Dir.home, package.path).to_path.gsub(Dir.home, '$HOME')}"
+    end
+    diff.removed.each do |f|
+      puts "[-] #{f.basename} -> #{f.as_dotfile(Dir.home, package.path).to_path.gsub(Dir.home, '$HOME')}"
+    end
+  end
+end

data/lib/cmd/help.rb

@@ -24,6 +24,7 @@ Troubleshooting:
   lace help
   lace info <pkg-name>
   lace validate <local-directory>
+  lace --version
 
 For further help visit:
   https://github.com/kairichard/lace

data/lib/cmd/setup.rb

@@ -1,7 +1,11 @@
+# frozen_string_literal: true
+
 require 'lace/package'
 require 'lace/exceptions'
 
-module Lace extend self
+module Lace
+  module_function
+
   def setup
     package_name = ARGV.shift
     PackageUtils.setup package_name

data/lib/cmd/validate.rb

@@ -1,28 +1,33 @@
+# frozen_string_literal: true
+
 require 'erb'
 
 require 'lace/package'
 require 'lace/utils'
 require 'lace/exceptions'
 
-VALIDATE = <<-EOS
-Lace-Manifest Validation Report:
-<% validation.errors.each do |error| -%>
-  <%= "%-58s [ %s ]" % [error[0] + ':', error[1]] %>
-<% unless error[2].nil? -%>
-<% error[2].each do |line| -%>
-    <%= Tty.gray %><%= '# '+line.to_s %><%= Tty.reset %>
-<% end -%>
-<% end -%>
-<% end -%>
+VALIDATE = <<~EOS
+  Lace-Manifest Validation Report:
+  <% validation.errors.each do |error| -%>
+    <%= "%-58s [ %s ]" % [error[0] + ':', error[1]] %>
+  <% unless error[2].nil? -%>
+  <% error[2].each do |line| -%>
+      <%= Tty.gray %><%= '# '+line.to_s %><%= Tty.reset %>
+  <% end -%>
+  <% end -%>
+  <% end -%>
 EOS
 
-module Lace extend self
+module Lace
+  module_function
+
   def validate
     resource = ARGV.shift
     flavor = ARGV.shift
     raise ResourceNotSpecified unless resource
+
     validation = PackageValidator.new(PackageFacts.new(resource), flavor)
-    puts ERB.new(VALIDATE, nil, '-').result(binding)
+    puts ERB.new(VALIDATE, trim_mode: '-').result(binding)
     Lace.failed = true if validation.has_errors?
   end
 end
@@ -32,7 +37,8 @@ class PackageValidator
 
   class << self
     attr_accessor :validations
-    def validate name, method_name
+
+    def validate(name, method_name)
       @validations ||= []
       @validations << [name, method_name]
     end
@@ -44,18 +50,19 @@ class PackageValidator
   validate 'setup', :setup_ok
   validate 'post-update hook', :post_update_hooks_ok
 
-  def initialize facts, flavor=nil
+  def initialize(facts, flavor = nil)
     @facts = facts
     @errors = []
     if @facts.has_flavors? && flavor.nil?
-      raise RuntimeError.new(FlavorArgumentMsg % @facts.flavors.join("\n- "))
+      raise FlavorArgumentMsg % @facts.flavors.join("\n- ").to_s
     elsif @facts.has_flavors? && flavor != false
       @facts.flavor! flavor
     end
+
     validate
   end
 
-  def check_hooks hook_cmd
+  def check_hooks(hook_cmd)
     hook_cmd.map do |cmd|
       if !File.exist? cmd
         "#{cmd} cannot be found"
@@ -65,13 +72,13 @@ class PackageValidator
     end.compact
   end
 
-  def hook_ok config_files
+  def hook_ok(config_files)
     hook_cmd = config_files
     if hook_cmd.empty?
       ["#{Tty.green}skipped#{Tty.reset}", nil]
     else
       errors = check_hooks hook_cmd
-      if errors.length > 0
+      if errors.length.positive?
         ["#{Tty.red}error#{Tty.reset}", errors]
       else
         ["#{Tty.green}ok#{Tty.reset}", nil]
@@ -88,7 +95,7 @@ class PackageValidator
   end
 
   def homepage_present
-    if @facts.has_key? 'homepage'
+    if @facts.key? 'homepage'
       ["#{Tty.green}found#{Tty.reset}", nil]
     else
       ["#{Tty.red}missing#{Tty.reset}", ['adding a homepage improves the credibility', 'of your package']]
@@ -96,7 +103,7 @@ class PackageValidator
   end
 
   def version_present
-    if @facts.has_key? 'version'
+    if @facts.key? 'version'
       ["#{Tty.green}found#{Tty.reset}", nil]
     else
       ["#{Tty.red}missing#{Tty.reset}", ['adding a version to the manifest improves', 'a future update experince']]
@@ -106,8 +113,10 @@ class PackageValidator
   def config_files_present
     if @facts.config_files.empty?
       ["#{Tty.red}missing#{Tty.reset}", ['Add config_files see manual for more information']]
-    elsif @facts.config_files.any?{|f| !File.exist? f}
-      ["#{Tty.red}error#{Tty.reset}", @facts.config_files.select{|f| !File.exist? f}.map{|f| "#{f.to_s.split("/").last} is missing from this package"}]
+    elsif @facts.config_files.any? { |f| !File.exist? f }
+      ["#{Tty.red}error#{Tty.reset}", @facts.config_files.reject do |f|
+        File.exist? f
+      end.map { |f| "#{f.to_s.split('/').last} is missing from this package" }]
     else
       ["#{Tty.green}found#{Tty.reset}", nil]
     end
@@ -120,6 +129,6 @@ class PackageValidator
   end
 
   def has_errors?
-    errors.any?{|e| !e[2].nil? }
+    errors.any? { |e| !e[2].nil? }
   end
 end

data/lib/extend/ARGV.rb

@@ -78,6 +78,16 @@ module LaceArgvExtension
     end
   end
 
+  def confirm?(prompt)
+    if flag?('--yes')
+      true
+    else
+      print "#{prompt} [y/N] "
+      $stdout.flush
+      /y/i.match?(STDIN.gets)
+    end
+  end
+
   private
 
   def downcased_unique_named

data/lib/lace/download_strategy.rb

@@ -1,8 +1,10 @@
-#Copyright 2009-2014 Max Howell and other contributors.
+# frozen_string_literal: true
+
+# Copyright 2009-2014 Max Howell and other contributors.
 #
-#Redistribution and use in source and binary forms, with or without
-#modification, are permitted provided that the following conditions
-#are met:
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
 #
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
@@ -10,45 +12,41 @@
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 #
-#THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-#IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-#OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-#IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-#NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-#DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-#THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-#(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-#THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-require "fileutils"
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+require 'fileutils'
 
 class AbstractDownloadStrategy
-  attr_reader :name, :resource, :target_folder
+  attr_reader :resource, :target_folder, :uri
 
-  def initialize uri, desired_package_name=nil
+  def initialize(uri, desired_package_name = nil)
     @desired_package_name = desired_package_name
     @uri = uri
-    @target_folder = Lace.pkgs_folder/name
-  end
-
-  def uri
-    @uri
+    @target_folder = Lace.pkgs_folder / name
   end
 
   # All download strategies are expected to implement these methods
   def fetch; end
   def stage; end
+
   def name
     @desired_package_name
   end
 end
 
-
 class LocalFileStrategy < AbstractDownloadStrategy
   def fetch
-    ohai "Fetching #@uri into #@target_folder"
-    FileUtils.cp_r @uri, @target_folder, :preserve => true
+    ohai "Fetching #{@uri} into #{@target_folder}"
+    FileUtils.cp_r @uri, @target_folder, preserve: true
     @target_folder
   end
 
@@ -57,22 +55,21 @@ class LocalFileStrategy < AbstractDownloadStrategy
   end
 end
 
-
 module GitCommands
   def update_repo
     safe_system 'git', 'fetch', 'origin'
   end
 
   def reset
-    safe_system 'git', "reset" , "--hard", "origin/HEAD"
+    safe_system 'git', 'reset', '--hard', 'origin/HEAD'
   end
 
   def git_dir
-    @target_folder.join(".git")
+    @target_folder.join('.git')
   end
 
   def repo_valid?
-    quiet_system "git", "--git-dir", git_dir, "status", "-s"
+    quiet_system 'git', '--git-dir', git_dir, 'status', '-s'
   end
 
   def repo_modified?
@@ -85,11 +82,11 @@ module GitCommands
   end
 
   def submodules?
-    @target_folder.join(".gitmodules").exist?
+    @target_folder.join('.gitmodules').exist?
   end
 
   def clone_args
-    args = %w{clone}
+    args = %w[clone]
     args << @uri << @target_folder
   end
 
@@ -103,46 +100,44 @@ module GitCommands
   end
 end
 
-
 class GitUpdateStrategy
   include GitCommands
 
-  def initialize name
-    @target_folder = Lace.pkgs_folder/name
+  def initialize(name)
+    @target_folder = Lace.pkgs_folder / name
   end
 
   def update
     if repo_valid?
-      puts "Updating #@target_folder"
+      puts "Updating #{@target_folder}"
       @target_folder.cd do
         update_repo
         reset
         update_submodules if submodules?
       end
     else
-      puts "Removing invalid .git repo"
+      puts 'Removing invalid .git repo'
       FileUtils.rm_rf @target_folder
       clone_repo
     end
   end
 end
 
-
 class GitDownloadStrategy < AbstractDownloadStrategy
   include GitCommands
 
   def fetch
-    ohai "Cloning #@uri"
+    ohai "Cloning #{@uri}"
 
     if @target_folder.exist? && repo_valid?
-      puts "Updating #@target_folder"
+      puts "Updating #{@target_folder}"
       @target_folder.cd do
         update_repo
         reset
         update_submodules if submodules?
       end
     elsif @target_folder.exist?
-      puts "Removing invalid .git repo"
+      puts 'Removing invalid .git repo'
       FileUtils.rm_rf @target_folder
       clone_repo
     else
@@ -154,47 +149,45 @@ class GitDownloadStrategy < AbstractDownloadStrategy
   def name
     if super
       super
-    elsif @uri.include? "github.com"
-      @uri.split("/")[-2]
+    elsif @uri.include? 'github.com'
+      @uri.split('/')[-2]
     elsif File.directory? @uri
       File.basename(@uri)
     else
-      raise "Cannot determine a proper name with #@uri"
+      raise "Cannot determine a proper name with #{@uri}"
     end
   end
-
 end
 
-class AbbrevGitDownloadStrategy < GitDownloadStrategy
-  def initialize uri, desired_package_name=nil
-    unless uri.end_with?(".git")
-      uri = "#{uri}.git"
-    end
+class GitHubDownloadStrategy < GitDownloadStrategy
+  def initialize(uri, desired_package_name = nil)
+    uri = "#{uri}.git" unless uri.end_with?('.git')
     uri = "https://github.com/#{uri}"
-    super uri, desired_package_name
+    super
   end
 end
 
-
 class DownloadStrategyDetector
   def self.detect(uri)
-      detect_from_uri(uri)
+    detect_from_uri(uri)
   end
 
   def self.detect_from_uri(uri)
-    is_git_dir = File.directory?(uri+"/.git")
-    has_single_slash = uri.scan("/").count == 1
-    if File.directory?(uri) && !is_git_dir
+    is_git_dir = File.directory?("#{uri}/.git")
+    has_single_slash = uri.scan('/').count == 1
+    via_ssh = uri.start_with?('git@')
+
+    if File.directory?(uri) && !is_git_dir && !via_ssh
       return LocalFileStrategy
     elsif is_git_dir
       return GitDownloadStrategy
-    elsif has_single_slash
-      return AbbrevGitDownloadStrategy
+    elsif has_single_slash && !via_ssh
+      return GitHubDownloadStrategy
     end
 
     case uri
-    when %r[^git://] then GitDownloadStrategy
-    when %r[^https?://.+\.git$] then GitDownloadStrategy
+    when /^git@/ then GitDownloadStrategy
+    when %r{^https?://.+\.git$} then GitDownloadStrategy
       # else CurlDownloadStrategy
     else
       raise "Cannot determine download startegy from #{uri}"

data/lib/lace/package/facts.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 require 'erb'
 
@@ -8,17 +10,18 @@ class PackageFacts
     "#<Facts:#{@package_path}>"
   end
 
-  def initialize package_path
+  def initialize(package_path)
     @package_path = Pathname.new(package_path)
-    @facts_file = @package_path/".lace.yml"
-    raise PackageFactsNotFound.new(@package_path) unless @facts_file.exist?
+    @facts_file = @package_path / '.lace.yml'
+    raise PackageFactsNotFound, @package_path unless @facts_file.exist?
+
     @facts = facts_file_to_hash
     @unflavorable_facts = facts_file_to_hash
   end
 
-  def flavor_with the_flavor
+  def flavor_with(the_flavor)
     if has_flavors? && the_flavor.nil?
-      raise FlavorArgumentRequired.new flavors
+      raise FlavorArgumentRequired, flavors
     elsif has_flavors? && the_flavor != false
       flavor! the_flavor
     end
@@ -26,78 +29,88 @@ class PackageFacts
 
   def config_files
     if has_config_files?
-      @facts["config_files"].flatten.map do |path|
+      @facts['config_files'].flatten.map do |path|
         Pathname.glob(@package_path + path).delete_if do |match|
-          match.directory? and path.include? "*"
+          match.directory? and path.include? '*'
         end
       end.flatten
-    else [] end
+    else
+      [] end
+  end
+
+  def globbed_folder
+    if has_config_files?
+      @facts['config_files'].flatten.select { |f| f.include? '*' }
+    else
+      [] end
   end
 
   def has_config_files?
-    has_key? 'config_files'
+    key? 'config_files'
   end
 
   def has_flavors?
-    @unflavorable_facts && !@unflavorable_facts["flavors"].nil?
+    @unflavorable_facts && !@unflavorable_facts['flavors'].nil?
   end
 
-  def has_key? key
-    @unflavorable_facts && (@unflavorable_facts.has_key?(key) or @facts.has_key?(key))
+  def key?(key)
+    @unflavorable_facts && (@unflavorable_facts.key?(key) or @facts.key?(key))
   end
 
   def version
-    @unflavorable_facts["version"] if @unflavorable_facts.key? "version"
+    @unflavorable_facts['version'] if @unflavorable_facts.key? 'version'
   end
 
   def setup_files
-    @facts["setup"].flatten rescue []
+    @facts['setup'].flatten
+  rescue StandardError
+    []
   end
 
   def homepage
-    @unflavorable_facts["homepage"] if @unflavorable_facts.key? "homepage"
+    @unflavorable_facts['homepage'] if @unflavorable_facts.key? 'homepage'
   end
 
   def flavors
-    if @unflavorable_facts && @unflavorable_facts.key?("flavors")
-      @unflavorable_facts["flavors"].keys.sort
+    if @unflavorable_facts&.key?('flavors')
+      @unflavorable_facts['flavors'].keys.sort
     else
       []
     end
   end
 
-  def flavor! the_flavor
+  def flavor!(the_flavor)
     raise PackageFlavorDoesNotExist.new(the_flavor, flavors) unless flavors.include? the_flavor
-    @facts = @unflavorable_facts["flavors"][the_flavor]
+
+    @facts = @unflavorable_facts['flavors'][the_flavor]
   end
 
   def unflavor!
     @facts = @unflavorable_facts
   end
 
-  def post hook_point
-    if @unflavorable_facts.nil? or !@facts.key? "post"
+  def post(hook_point)
+    if @unflavorable_facts.nil? || !@facts.key?('post')
       []
     else
-      post_hook = @facts["post"]
+      post_hook = @facts['post']
       (post_hook[hook_point.to_s] || []).flatten
     end
   end
 
   protected
+
   def facts_file_to_hash
     begin
       rendered_manifest = ERB.new(@facts_file.read, trim_mode: '-').result(binding)
     rescue Exception => e
       raise ManifestErbError.new(self, e)
     end
-    value = YAML.load rendered_manifest, aliases: true
-    if value.is_a?(String) && value == "---"
-      return Hash.new
+    value = YAML.safe_load rendered_manifest, aliases: true
+    if value.is_a?(String) && value == '---'
+      {}
     else
       value
     end
   end
 end
-
-

data/lib/lace/package/package.rb

@@ -1,31 +1,35 @@
-require 'set'
+# frozen_string_literal: true
 
+require 'set'
 require 'lace/download_strategy'
 
 class Package
   include GitCommands
   attr_reader :name, :facts, :path
 
-  def initialize name, flavor=nil
+  def initialize(name, flavor = nil)
     @name = name
-    @path = Lace.pkgs_folder/name
-    raise PackageNotInstalled.new(name) unless @path.exist?
+    @path = Lace.pkgs_folder / name
+    raise PackageNotInstalled, name unless @path.exist?
+
     @flavor = flavor
     read_facts!
   end
 
   def setup
     return if ARGV.nohooks?
+
     ENV['LACEPKG_PATH'] = @path
-     @path.cd do
-       facts.setup_files.each do |cmd|
-         safe_system cmd
-       end
-     end
+    @path.cd do
+      facts.setup_files.each do |cmd|
+        safe_system cmd
+      end
+    end
   end
 
   def after_update
     return if ARGV.nohooks?
+
     @path.cd do
       facts.post(:update).each do |cmd|
         system cmd
@@ -40,17 +44,18 @@ class Package
 
   def is_modified?
     return false unless is_git_repo?
+
     @target_folder = @path
     repo_modified?
   end
 
   def is_active?
-    home_dir = ENV["HOME"]
+    home_dir = Dir.home
     if @facts.has_flavors? && @flavor == false
-      @facts.flavors.any?{|f| Package.new(@name, f).is_active?}
+      @facts.flavors.any? { |f| Package.new(@name, f).is_active? }
     else
       config_files = Set.new @facts.config_files
-      config_files.all? do |p| 
+      config_files.all? do |p|
         dotfile = p.as_dotfile(home_dir, @path)
         dotfile.exist? and dotfile.symlink? and dotfile.readlink.dirname.to_s.include?(@path)
       end
@@ -64,11 +69,8 @@ class Package
 
   def deactivate!
     files = @facts.config_files
-    home_dir = ENV["HOME"]
     files.each do |file|
-      file = Pathname.new(file)
-      dotfile = file.as_dotfile(home_dir, @path)
-      FileUtils.rm_f dotfile if dotfile.exist? && dotfile.readlink == file
+      unlink_file file
     end
   end
 
@@ -79,23 +81,30 @@ class Package
     end
   end
 
-  def link_file file
-    home_dir = ENV["HOME"]
+  def unlink_file(file, force: ARGV.force?)
+    dotfile = file.as_dotfile(Dir.home, @path)
+    if (dotfile.exist? || force) && dotfile.symlink? && dotfile.readlink == file
+      FileUtils.rm_f(dotfile)
+      return true
+    end
+    false
+  end
+
+  def link_file(file)
+    home_dir = Dir.home
     # if ends in erb -> generate it
     src = file
     dest = src.as_dotfile(home_dir, @path)
     if dest.exist? && dest.directory?
       raise WouldOverwriteError.new(dest, src) unless ARGV.force?
+
       FileUtils.mv dest, dest.as_backup
     end
-    link_file_or_directory src, dest
+    link_file_or_directory src, dest, force: ARGV.force?
   end
 
-  def link_file_or_directory(src, dest)
-    puts "link_file"
-    unless dest.dirname.exist?
-      dest.dirname.mkpath
-    end
-    FileUtils.ln_s src, dest, :force => ARGV.force?
+  def link_file_or_directory(src, dest, force: ARGV.force?)
+    dest.dirname.mkpath unless dest.dirname.exist?
+    FileUtils.ln_s src, dest, force: force
   end
 end

data/lib/lace/package/utils.rb

@@ -1,59 +1,99 @@
-require 'lace/exceptions'
+# frozen_string_literal: true
 
-class PackageUtils
+require('lace/exceptions')
+
+Diff = Struct.new(:added, :removed) do
+end
 
-  def self.fetch uri, desired_package_name=nil
+class PackageUtils
+  def self.fetch(uri, desired_package_name = nil)
     downloader_cls = DownloadStrategyDetector.detect(uri)
     downloader = downloader_cls.new(uri, desired_package_name)
-    raise PackageAlreadyInstalled.new(downloader.target_folder) if downloader.target_folder.exist?
+    raise(PackageAlreadyInstalled, downloader.target_folder) if downloader.target_folder.exist?
+
     downloader.fetch
-    return downloader.name, downloader.target_folder
+    [downloader.name, downloader.target_folder]
   end
 
-  def self.remove package_name
+  def self.remove(package_name)
     package = Package.new(package_name, false)
-    raise CannotRemoveActivePackage.new if package.is_active?
-    ohai "Removing"
-    FileUtils.rm_rf package.path
-  end
-
-  def self.setup package_name
-    begin
-      package = Package.new(package_name, ARGV.first)
-      package.activate!
-      package.setup
-    rescue FlavorError => e
-      onoe e.message
-      onoe "Package remains installed but was not activated"
-    end
+    raise(CannotRemoveActivePackage) if package.is_active?
+
+    ohai('Removing')
+    FileUtils.rm_rf(package.path)
+  end
+
+  def self.setup(package_name)
+    package = Package.new(package_name, ARGV.first)
+    package.activate!
+    package.setup
+  rescue StandardError => e
+    onoe(e.message)
+    odie('Package remains installed but was not activated')
   end
 
-  def self.deactivate package_name
+  def self.deactivate(package_name)
     package = Package.new(package_name, ARGV.first)
-    raise NonActiveFlavorError.new unless package.is_active? || ARGV.force?
-    ohai "Deactivating"
+    raise(NonActiveFlavorError) unless package.is_active? || ARGV.force?
+
+    ohai('Deactivating')
     package.deactivate!
   end
 
-  def self.activate package_name
+  def self.activate(package_name)
     package = Package.new(package_name, ARGV.first)
-    raise AlreadyActiveError.new if Package.new(package_name, false).is_active?
-    ohai "Activating"
+    raise(AlreadyActiveError) if Package.new(package_name, false).is_active?
+
+    ohai('Activating')
     package.activate!
   end
 
-  def self.update package_name
+  def self.update(package_name)
     package = Package.new(package_name, false)
-    raise OnlyGitReposCanBeUpdatedError.new unless package.is_git_repo?
+    raise(OnlyGitReposCanBeUpdatedError) unless package.is_git_repo?
+
     updater = GitUpdateStrategy.new(package_name)
     was_active_before_update = package.is_active?
-    self.deactivate(package_name) if was_active_before_update
-    ohai "Updating"
+    deactivate(package_name) if was_active_before_update
+    ohai('Updating')
     updater.update
-    self.activate(package_name) if was_active_before_update
-    package = Package.new package_name, false
+    activate(package_name) if was_active_before_update
+    package = Package.new(package_name, false)
     package.after_update
   end
+
+  def self.diff(package_name)
+    home_dir = Dir.home
+    package = Package.new(package_name, ARGV.first)
+    config_files = Set.new(package.facts.config_files)
+    files_pointing_to_package = symlinks_to_package(package)
+    files_from_manifest_not_in_home = Set.new(config_files.reject do |f|
+      f.as_dotfile(home_dir, package.path).exist?
+    end)
+    Diff.new(files_from_manifest_not_in_home, (files_pointing_to_package - config_files))
+  end
+
+  def self.symlinks_to_package(package)
+    home_dir = Dir.home
+    found_links = Set.new
+    traverse_directory(home_dir, package) { |entry| (found_links << Pathname.new(File.readlink(entry))) }
+    found_links
+  end
 end
 
+COMMON_CONFIG_FOLDERS = ['config'].freeze
+
+def traverse_directory(directory, package, &block)
+  package_path = package.path
+  whitelisted_folders = package.facts.globbed_folder + COMMON_CONFIG_FOLDERS
+  Dir.foreach(directory) do |entry|
+    next if ['.', '..'].include?(entry)
 
+    entry_path = File.join(directory, entry)
+    if File.symlink?(entry_path) && File.readlink(entry_path).include?(package_path)
+      block.call(entry_path)
+    elsif File.directory?(entry_path) && whitelisted_folders.any? { |f| entry_path.include?(f) }
+      traverse_directory(entry_path, package, &block)
+    end
+  end
+end

data/lib/lace/package_cli.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'lace/package'
+require 'lace/exceptions'

data/lib/lace/version.rb

@@ -1,3 +1,3 @@
 module Lace
-  VERSION = "0.5.1"
+  VERSION = "0.5.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lace
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.3
 platform: ruby
 authors:
 - Kai Richard Koenig
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-13 00:00:00.000000000 Z
+date: 2025-06-17 00:00:00.000000000 Z
 dependencies: []
 description: Lace lets you manage your dotfiles when using them on multiple machines
 email: kai.richard.koenig@gmail.com
@@ -19,7 +19,9 @@ extra_rdoc_files: []
 files:
 - bin/lace
 - lib/cmd/activate.rb
+- lib/cmd/apply.rb
 - lib/cmd/deactivate.rb
+- lib/cmd/diff.rb
 - lib/cmd/fetch.rb
 - lib/cmd/help.rb
 - lib/cmd/inspect.rb
@@ -39,6 +41,7 @@ files:
 - lib/lace/package/facts.rb
 - lib/lace/package/package.rb
 - lib/lace/package/utils.rb
+- lib/lace/package_cli.rb
 - lib/lace/utils.rb
 - lib/lace/version.rb
 homepage: https://github.com/kairichard/lace