lace 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80eaddd6780262b38522e7d8d6f65871b9ab81197b5704133d71e2b4662882c3
-  data.tar.gz: 3ad1dc409bb5423a65ddd2f5a5ba01e8da64d6dbd571ea4ff66b8de9b5d87336
+  metadata.gz: d98c40941c6f892e520dbd99ba1d29f7a3485ce59353e12efbe8268ec38cbe68
+  data.tar.gz: 6f04e59649921e470016585f28390e13c3b3e6fed0c229bb47cf291d2c795999
 SHA512:
-  metadata.gz: 9197f2403e97ab8f15273faddbbb05d734b0888329dee180078f11d330a1b72c5afe5cbf2cdc1616919319d14651a25b6470d74fc83197c575a9c492d38ec143
-  data.tar.gz: 1d4edb089fe50cb82f8796fd297d055cf4c58539ad640c1ec06aeeea3de1d330c2d591203dbf62784b6c099e5b46a238269fc7026d0d0580a842aff6468d0a5f
+  metadata.gz: 2972f704cc11a8e6075bd3a2adff8cc560a318af551bc91dbb751f82777f75b23d0419c4fc43f7618f2d02dcdce79fab57757ab1ba9e1f9dda70f090ef8e0dc8
+  data.tar.gz: e367b0b4e7e5faf9ae965a8cd807b5ac775e8e4b431604ec5500590308488d960523fff4fd8b1b5a0c687425e466eb8be98d5b8e136baeb491d3b74f667fc672

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

@@ -82,14 +82,15 @@ 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?
+    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.0"
 end

metadata

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