lace 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7f0f417d0dbe5369de03faab17bf6deaca9fb97974d297ba00737111a83b3ee
-  data.tar.gz: 6506f85738991370546e31f9b2f1fa890ac73266c4acebfe0efc7df151819186
+  metadata.gz: 0e9374d4a207b650f55ec19e285891ac00fc55da706d5a87b8ce5ff642315f30
+  data.tar.gz: 457594f9250c5e7045a00b227596c41f461a8487e3be6c95240f6891b8067e6e
 SHA512:
-  metadata.gz: 822ca5da353445be87fb1d31f2c4cb3bd0a8582bbbaecbf64572878e092fb83f63cf226407767414ea2b0e6a0d69d02b299da914ffbea869912301f4b8226915
-  data.tar.gz: 3d5039c97612a34c1daadb8239e41b620d33f5b6db0a91b029a1e3b80b39acc32663de850959fb75d8548b74fb40171293d63342136cc85d8a1e42c79771d47d
+  metadata.gz: f546f2835196c35b71522b3683376c79c3deee6b82529c24108639d44fa148bca4a1127aefcab3d6e38209b8c7cda917a535019fb1f2068db92d06427817b8b2
+  data.tar.gz: 386d3fb4712ad53fe2fc1f06cfa853c1fd552d5a23b0d46fc8160925b62ed5ff09f19ee41d48309ba5ae55bce9eb1964c4b1f6ce65b25507f3615eb0da2fc824

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

@@ -12,6 +12,12 @@ module Lace
 
     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')}"

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/package/package.rb

@@ -69,11 +69,8 @@ class Package
 
   def deactivate!
     files = @facts.config_files
-    home_dir = Dir.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
 
@@ -84,6 +81,15 @@ class Package
     end
   end
 
+  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
@@ -94,11 +100,11 @@ class Package
 
       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)
+  def link_file_or_directory(src, dest, force: ARGV.force?)
     dest.dirname.mkpath unless dest.dirname.exist?
-    FileUtils.ln_s src, dest, force: ARGV.force?
+    FileUtils.ln_s src, dest, force: force
   end
 end

data/lib/lace/package/utils.rb

@@ -34,7 +34,7 @@ class PackageUtils
 
   def self.deactivate(package_name)
     package = Package.new(package_name, ARGV.first)
-    raise(NonActiveFlavorError) unless package.is_active? && ARGV.force?
+    raise(NonActiveFlavorError) unless package.is_active? || ARGV.force?
 
     ohai('Deactivating')
     package.deactivate!

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.2"
+  VERSION = "0.5.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lace
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Kai Richard Koenig
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-25 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,6 +19,7 @@ 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
@@ -40,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