lace 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d98c40941c6f892e520dbd99ba1d29f7a3485ce59353e12efbe8268ec38cbe68
-  data.tar.gz: 6f04e59649921e470016585f28390e13c3b3e6fed0c229bb47cf291d2c795999
+  metadata.gz: 46881767c22f451c4e42104713158a054acfe41eee483ab2cac43416d8e99738
+  data.tar.gz: b8d483c8695e034ddd022522362b8aaad46a9947c98bf02bd92f9880cbda3280
 SHA512:
-  metadata.gz: 2972f704cc11a8e6075bd3a2adff8cc560a318af551bc91dbb751f82777f75b23d0419c4fc43f7618f2d02dcdce79fab57757ab1ba9e1f9dda70f090ef8e0dc8
-  data.tar.gz: e367b0b4e7e5faf9ae965a8cd807b5ac775e8e4b431604ec5500590308488d960523fff4fd8b1b5a0c687425e466eb8be98d5b8e136baeb491d3b74f667fc672
+  metadata.gz: 3200530a5a2007710f79508f5027c1caa72bf08377f296a6adb6b94db404a7b6dca9abbcd5dfe7d9e8bc1945741c9f61299e06cbf7e15a5ac74e2ced4d81ee1e
+  data.tar.gz: 0a6019e2cae178f0a276ecc943466445f493b6a30df7f0ae5f36db9a344b2641bfde336cced8e6be47e02b979ed7d749632d6e0057e544a65d21b50f3c219242

data/lib/cmd/list.rb

@@ -2,38 +2,20 @@ require 'lace/package'
 
 module Lace extend self
 
-  def linked_files
-    home_dir = Pathname.new ENV["HOME"]
-    find_links home_dir
-  end
-
-  def find_links dir
-    dir.children.map do |path|
-      if path.directory? && !path.symlink?
-        find_links path
-      else
-        File.readlink path if path.symlink?
-      end
-    end.flatten.compact.uniq
-  end
-
   def active_packages
-    linked_files.map do |path|
-      Pathname.new(File.dirname(path)).basename.to_s
-    end.uniq
+    installed_packages.select(&:is_active?)
   end
 
   def installed_packages
     Dir.glob(File.join(Lace.pkgs_folder, "**")).sort.map do |p|
-      Pathname.new(p).basename.to_s
+      Package.new(Pathname.new(p).basename.to_s, false)
     end
   end
 
   def list
     if installed_packages.length > 0
-      installed_packages.map do |d|
-        package = Package.new(d, false)
-        puts "[#{Tty.green}#{package.is_active? ? "*" : " "}#{Tty.reset}] #{d}#{package.is_modified? ? " (has local changes)":""}"
+      installed_packages.map do |package|
+        puts "[#{Tty.green}#{package.is_active? ? "*" : " "}#{Tty.reset}] #{package.name}#{package.is_modified? ? " (has local changes)":""}"
       end
     else
       puts "There are no pkgs installed"

data/lib/lace/package/package.rb

@@ -7,10 +7,9 @@ class Package
   attr_reader :name, :facts, :path
 
   def initialize name, flavor=nil
-    require 'cmd/list'
-    raise PackageNotInstalled.new(name) unless Lace.installed_packages.include?(name)
     @name = name
     @path = Lace.pkgs_folder/name
+    raise PackageNotInstalled.new(name) unless @path.exist?
     @flavor = flavor
     read_facts!
   end
@@ -46,12 +45,15 @@ class Package
   end
 
   def is_active?
+    home_dir = ENV["HOME"]
     if @facts.has_flavors? && @flavor == false
       @facts.flavors.any?{|f| Package.new(@name, f).is_active?}
     else
-      linked_files = Set.new Lace.linked_files.map(&:to_s)
-      config_files = Set.new @facts.config_files.map(&:to_s)
-      config_files.subset? linked_files
+      config_files = Set.new @facts.config_files
+      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
     end
   end
 
@@ -90,6 +92,7 @@ class Package
   end
 
   def link_file_or_directory(src, dest)
+    puts "link_file"
     unless dest.dirname.exist?
       dest.dirname.mkpath
     end

data/lib/lace/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lace
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Kai Richard Koenig
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-12 00:00:00.000000000 Z
+date: 2024-12-13 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