lace 0.4.1 → 0.4.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTg2ZTcyYWQ2YjgxYzNiZGJmNzY5NmI0ZjBjOTU4MTZlOTQ0N2VmNQ==
+    NjU0MjljMzhjN2E4ZDY4NWNmZWM0ZGUyMTcyODQ0Y2JiOTdjYmM2ZQ==
   data.tar.gz: !binary |-
-    ZDNlNTI0ZjAzZjNjNTJjZTVmMTAyY2IzYzU1ZjM1NGIzYjI5OGExMA==
+    M2E4ZWZjOTQ0ZDJhNTEyZDFlZmM3NjAzNmM2ZDRkZGU5ZjMyOTdhZA==
 SHA512:
   metadata.gz: !binary |-
-    NTc1NDk0YTZjYTY3YjRjMjRiM2M1MTkxZGZkMTRmZGMyMDVjMzdmOTFiNWU2
-    MzIzNWZkODNmMzE4NzI1MjZmYThhODYwNTFkZmMzYTZiM2NmYWUyZWEyNmIy
-    ZjE0ODNlMzg0YTVkYjQyMTk0M2RjMmQxNWY0Zjk5MzNkNTNkNjg=
+    Y2RkYjNjMDJmMmU4ZTFiZmJhNzhhYWUxZDRmYjkyM2NlZTZhMjUyMGZiM2U4
+    OWI5MWE0NmQ3NGZkZDJjNjNmMDgzYmUzNmVlNGQ2MzBhYmFjMTAwNGVlOGZi
+    MTNhZGY4ZTY1ZTQyMGEwN2VkZmFiNGI1ZmE1MjYyMWE0NGVlNjQ=
   data.tar.gz: !binary |-
-    MzNmNWRlYzVlMjNkZDA1NjczYmU4ZDQ0YjAzZjUyZTU4NTQ5MmU2MGRmNGI0
-    NGJiMDI5ZDQ4NTE2ZTI1YWI3OWNjNTY4MTJhZjQ2YTJlOTMyNjllMDAyOTc1
-    YTc3Mjk5MGIyOGFjNTMzOWMxNTM5NTkxMzVjMTMyMmZlZGZhMzI=
+    NjNjZWQ2MzRiZGY0ZGI5ZDk3N2QyOTBmZWIxNTIzMGI4ZmY2M2Q2ODA4YTRm
+    ODEyYTFjYmZhNzFjYjQ0YmYzMmM1ZjRhY2NmNTRmZjQ0YjNlYjc4YzExNTYz
+    ODBiZDYxMTMzMTk4ZWNmNDIxZGQ0OTBiYjgwNDFhMjRiMzQ3ODg=

data/lib/lace/package/facts.rb

@@ -26,9 +26,21 @@ class PackageFacts
 
   def config_files
     if has_config_files?
-      @facts["config_files"].flatten.map do |file|
+      paths = @facts["config_files"].flatten.map do |file|
         Pathname.glob(@package_path + file)
       end.flatten
+      ppaths = paths
+      ppaths.each do |path|
+        if path.file? and paths.include?(path.dirname)
+          paths.delete_if {|p| p == path.dirname}
+        end
+        if path.directory?
+          if !(paths & path.children).empty?
+            paths.delete_if {|p| p == path}
+          end
+        end
+      end
+      paths
     else [] end
   end
 

data/lib/lace/package/package.rb

@@ -82,7 +82,7 @@ class Package
     # if ends in erb -> generate it
     src = file
     dest = src.as_dotfile(home_dir, @path)
-    if src.exist? && dest.exist? && dest.directory? && ARGV.force?
+    if dest.exist? && dest.directory? && ARGV.force?
       FileUtils.mv dest, dest.as_backup
     end
     link_file_or_directory src, dest
@@ -94,5 +94,4 @@ class Package
     end
     FileUtils.ln_s src, dest, :force => ARGV.force?
   end
-
 end

data/lib/lace/version.rb

@@ -1,3 +1,3 @@
 module Lace
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lace
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Kai Richard Koenig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-18 00:00:00.000000000 Z
+date: 2015-06-19 00:00:00.000000000 Z
 dependencies: []
 description: Lace lets you manage your dotfiles when using them on multiple machines
 email: kai@kairichardkoenig.de