lace 0.4.0 → 0.4.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmM4ZTMxYjE1NTNmNjM4MWEzZjFlYTNhMTMyMDNjZDc3OGQ3NjYzMA==
+    OTg2ZTcyYWQ2YjgxYzNiZGJmNzY5NmI0ZjBjOTU4MTZlOTQ0N2VmNQ==
   data.tar.gz: !binary |-
-    MTc1ZTA0YjA0NjViMmU4YjFmNTJkM2VjMGViMzg4M2Q2NzFlMDU0ZQ==
+    ZDNlNTI0ZjAzZjNjNTJjZTVmMTAyY2IzYzU1ZjM1NGIzYjI5OGExMA==
 SHA512:
   metadata.gz: !binary |-
-    YzBjYzBkZDc3ZjI4ZjU0NmIxNWRkZDQ1Nzk1ODYwNDFmMGU4MjY3NGJkMTFm
-    MmQ3ZWNmY2I1ODJkYWNmZTNkMWYyNGFhODJlYTBhYjRjOWVmMTMwODI1Yzg2
-    MzljNDBmMWU4YzAwMzI4NGFmNjQ1ZmM4ZDNkNjIwMDkyODhmNzM=
+    NTc1NDk0YTZjYTY3YjRjMjRiM2M1MTkxZGZkMTRmZGMyMDVjMzdmOTFiNWU2
+    MzIzNWZkODNmMzE4NzI1MjZmYThhODYwNTFkZmMzYTZiM2NmYWUyZWEyNmIy
+    ZjE0ODNlMzg0YTVkYjQyMTk0M2RjMmQxNWY0Zjk5MzNkNTNkNjg=
   data.tar.gz: !binary |-
-    YjQwYjBjN2QyYWY4ZDJhMjc3ZGJjYjdlM2VhNjRjYzU3ZGFlY2Y0MDIyZTdm
-    M2NlZGJlZTU5NjVhMjRlZTExNDcyOTc0MDI1OTdhMGU4ODMzMjgxYmJkNjA3
-    YzUzYWE5NzQwZTZhZDY3ZGU4NmFhOGJmNDllNTdhYmY5NjY3MTY=
+    MzNmNWRlYzVlMjNkZDA1NjczYmU4ZDQ0YjAzZjUyZTU4NTQ5MmU2MGRmNGI0
+    NGJiMDI5ZDQ4NTE2ZTI1YWI3OWNjNTY4MTJhZjQ2YTJlOTMyNjllMDAyOTc1
+    YTc3Mjk5MGIyOGFjNTMzOWMxNTM5NTkxMzVjMTMyMmZlZGZhMzI=

data/lib/extend/pathname.rb

@@ -90,8 +90,12 @@ class Pathname
     join that.to_s
   end
 
-  def as_dotfile base_folder
-    Pathname.new File.join(base_folder, ".#{basename}")
+  def as_backup
+    Pathname.new File.join(dirname, "#{basename}.lace.bak")
+  end
+
+  def as_dotfile base_folder, subtract
+    Pathname.new File.join(base_folder, ".#{to_path.gsub(subtract, "")[1..-1]}")
   end
 
 end

data/lib/lace/package/facts.rb

@@ -25,13 +25,15 @@ class PackageFacts
   end
 
   def config_files
-    if @unflavorable_facts.nil? or @facts["config_files"].nil?
-      []
-    else
+    if has_config_files?
       @facts["config_files"].flatten.map do |file|
-        @package_path + file
-      end
-    end
+        Pathname.glob(@package_path + file)
+      end.flatten
+    else [] end
+  end
+
+  def has_config_files?
+    has_key? 'config_files'
   end
 
   def has_flavors?
@@ -39,7 +41,7 @@ class PackageFacts
   end
 
   def has_key? key
-    @unflavorable_facts && @unflavorable_facts.has_key?(key)
+    @unflavorable_facts && ( @unflavorable_facts.has_key?(key) or @facts.has_key?(key))
   end
 
   def version

data/lib/lace/package/package.rb

@@ -65,17 +65,34 @@ class Package
     home_dir = ENV["HOME"]
     files.each do |file|
       file = Pathname.new(file)
-      dotfile = file.as_dotfile(home_dir)
+      dotfile = file.as_dotfile(home_dir, @path)
       FileUtils.rm_f dotfile if dotfile.exist? && dotfile.readlink == file
     end
   end
 
   def activate!
     files = @facts.config_files
-    home_dir = ENV["HOME"]
     files.each do |file|
-      # if ends in erb -> generate it
-      FileUtils.ln_s file, Pathname.new(file).as_dotfile(home_dir), :force => ARGV.force?
+      link_file file
+    end
+  end
+
+  def link_file file
+    home_dir = ENV["HOME"]
+    # if ends in erb -> generate it
+    src = file
+    dest = src.as_dotfile(home_dir, @path)
+    if src.exist? && dest.exist? && dest.directory? && 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?
+      dest.dirname.mkpath
+    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.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lace
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Kai Richard Koenig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-15 00:00:00.000000000 Z
+date: 2015-06-18 00:00:00.000000000 Z
 dependencies: []
 description: Lace lets you manage your dotfiles when using them on multiple machines
 email: kai@kairichardkoenig.de
@@ -17,7 +17,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/lace
 - lib/cmd/activate.rb
 - lib/cmd/deactivate.rb
 - lib/cmd/fetch.rb
@@ -31,15 +30,16 @@ files:
 - lib/cmd/validate.rb
 - lib/extend/ARGV.rb
 - lib/extend/pathname.rb
-- lib/lace.rb
 - lib/lace/download_strategy.rb
 - lib/lace/exceptions.rb
-- lib/lace/package.rb
 - lib/lace/package/facts.rb
 - lib/lace/package/package.rb
 - lib/lace/package/utils.rb
+- lib/lace/package.rb
 - lib/lace/utils.rb
 - lib/lace/version.rb
+- lib/lace.rb
+- bin/lace
 homepage: https://github.com/kairichard/lace
 licenses:
 - MIT
@@ -60,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Manage your .dotfiles