sundae 0.9.1 → 0.9.2

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.9.2 / 2009-04-28
+
+* 1 minor enhancement
+  * less manual tasks required if you want to move mnts
+
 === 0.9.1 / 2009-04-27
 
 * 1 minor enhancement

data/lib/sundae.rb

@@ -7,7 +7,7 @@ require 'find'
 # together using symbolic links.
 #
 module Sundae
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 
   DEFAULT_CONFIG_FILE = File.expand_path(File.join(ENV['HOME'], '.sundae'))
  
@@ -274,14 +274,18 @@ module Sundae
   # Create a symbolic link to <em>target</em> from <em>link_name</em>.
   #
   def self.create_file_link(target, link_name) 
-    raise ArgumentError unless File.file?(target)
-    unless File.exist?(link_name)
-      FileUtils.ln_s(target, link_name)
-    else
-      unless (File.symlink?(link_name) && 
-              (File.expand_path(File.readlink(link_name)) == File.expand_path(target)))
-        raise "Could not link #{target} to #{link_name}"
+    raise ArgumentError, "#{target} does not exist" unless File.file?(target)
+    if File.exist?(link_name)
+      raise ArgumentError, "#{link_name} cannot be overwritten" unless File.symlink?(link_name)
+      if (not File.exist?(File.readlink(link_name)))
+        FileUtils.ln_sf(target, link_name)
+      else
+        unless (File.expand_path(File.readlink(link_name)) == File.expand_path(target))
+          raise ArgumentError, "#{link_name} points to #{File.readlink(link_name)}, not #{target}" unless File.symlink?(link_name)
+        end
       end
+    else
+      FileUtils.ln_s(target, link_name)
     end
   end
 
@@ -291,8 +295,8 @@ module Sundae
   #
   def self.create_directory_link(target, link_name) 
     raise ArgumentError unless File.directory?(target)
-    unless File.exist?(link_name)
-      FileUtils.ln_s(target, link_name)
+    if (not File.exist?(link_name)) || (File.symlink?(link_name) && (not File.exist?(File.readlink(link_name))))
+      FileUtils.ln_sf(target, link_name)
     else
       case File.ftype(link_name)
       when 'file'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sundae
 version: !ruby/object:Gem::Version 
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors: 
 - Don
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-27 00:00:00 -04:00
+date: 2009-04-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency