lace 0.4.4 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80eaddd6780262b38522e7d8d6f65871b9ab81197b5704133d71e2b4662882c3
-  data.tar.gz: 3ad1dc409bb5423a65ddd2f5a5ba01e8da64d6dbd571ea4ff66b8de9b5d87336
+  metadata.gz: 46881767c22f451c4e42104713158a054acfe41eee483ab2cac43416d8e99738
+  data.tar.gz: b8d483c8695e034ddd022522362b8aaad46a9947c98bf02bd92f9880cbda3280
 SHA512:
-  metadata.gz: 9197f2403e97ab8f15273faddbbb05d734b0888329dee180078f11d330a1b72c5afe5cbf2cdc1616919319d14651a25b6470d74fc83197c575a9c492d38ec143
-  data.tar.gz: 1d4edb089fe50cb82f8796fd297d055cf4c58539ad640c1ec06aeeea3de1d330c2d591203dbf62784b6c099e5b46a238269fc7026d0d0580a842aff6468d0a5f
+  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/exceptions.rb

@@ -58,6 +58,14 @@ class PackageFlavorDoesNotExist < FlavorError
   end
 end
 
+class WouldOverwriteError < RuntimeError
+  def initialize dest, src
+    super %Q(Refusing to overwrite #{dest} with #{src}
+Use glob pattern in .lace.yaml like #{src.basename}/**/* 
+or invoke lace with `--force` to create backup of #{dest})
+  end
+end
+
 class ManifestErbError < RuntimeError
   def initialize fact, exception
     super "#{exception.to_s}\nin #{fact.facts_file}"

data/lib/lace/package/facts.rb

@@ -43,7 +43,7 @@ class PackageFacts
   end
 
   def has_key? key
-    @unflavorable_facts && ( @unflavorable_facts.has_key?(key) or @facts.has_key?(key))
+    @unflavorable_facts && (@unflavorable_facts.has_key?(key) or @facts.has_key?(key))
   end
 
   def version
@@ -87,11 +87,11 @@ class PackageFacts
   protected
   def facts_file_to_hash
     begin
-      rendered_manifest = ERB.new(@facts_file.read, nil, '-').result(binding)
+      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
+    value = YAML.load rendered_manifest, aliases: true
     if value.is_a?(String) && value == "---"
       return Hash.new
     else

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
 
@@ -82,14 +84,16 @@ class Package
     # if ends in erb -> generate it
     src = file
     dest = src.as_dotfile(home_dir, @path)
-    if dest.exist? && dest.directory? && ARGV.force?
+    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
   end
 
   def link_file_or_directory(src, dest)
-    if !dest.dirname.exist?
+    puts "link_file"
+    unless dest.dirname.exist?
       dest.dirname.mkpath
     end
     FileUtils.ln_s src, dest, :force => ARGV.force?

data/lib/lace/version.rb

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

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: lace
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.1
 platform: ruby
 authors:
 - Kai Richard Koenig
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-20 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@kairichardkoenig.de
+email: kai.richard.koenig@gmail.com
 executables:
 - lace
 extensions: []
@@ -45,7 +45,7 @@ homepage: https://github.com/kairichard/lace
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -53,15 +53,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.6
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Manage your .dotfiles
 test_files: []