sbfaulkner-astrovan 0.5.6 → 0.5.7

data/README.rdoc

@@ -28,16 +28,16 @@ This is my attempt.
 
 == CHANGES
 
-=== 0.5.6
+=== 0.5.7
+- fix bug when symlink to directory already exists
 
+=== 0.5.6
 - support for specification of git and rake command paths
 
 === 0.5.5
-
 - change working directory for rake tasks
 
 === 0.5.4
-
 - handle github private repository urls
 
 == TODO

data/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 5
-:patch: 6
+:patch: 7

data/lib/astrovan/util.rb

@@ -34,7 +34,7 @@ module Astrovan
       # flatten, so that arrays of paths can be passed as arguments
       paths = paths.flatten.join(' ')
       # TODO: consider using sudo?
-      exec "ln -sf #{paths} #{to}", options
+      exec "ln -shf #{paths} #{to}", options
     end
   end
 end

data/test/util_test.rb

@@ -63,12 +63,42 @@ class UtilTest < Test::Unit::TestCase
     assert_equal data, File.open(target) { |f| f.gets.chomp }
   end
 
+  def test_should_symlink_to_directory
+    system "mkdir -p #{@path}"
+    data = create_file("#{@path}/hello")
+    target = @path + ".lnk"
+    assert File.exist?(@path)
+    assert File.directory?(@path)
+    using 'astrovan.local', :password => ENV['PASSWORD'], :path => @path, :target => target do
+      symlink path, :to => target
+    end
+    assert File.exist?(target)
+    assert File.symlink?(target)
+    assert_equal data, File.open("#{target}/hello") { |f| f.gets.chomp }
+  end
+
+  def test_should_replace_symlink_to_directory
+    system "mkdir -p #{@path}"
+    data = create_file("#{@path}/hello")
+    target = @path + ".lnk"
+    assert File.exist?(@path)
+    assert File.directory?(@path)
+    system "ln -s /var/tmp #{target}"
+    using 'astrovan.local', :password => ENV['PASSWORD'], :path => @path, :target => target do
+      symlink path, :to => target
+    end
+    assert File.exist?(target)
+    assert File.symlink?(target)
+    assert_equal data, File.open("#{target}/hello") { |f| f.gets.chomp }
+  end
+
 protected
-  def create_file
+  def create_file(path = nil)
+    path ||= @path
     data = Time.now.utc.to_s
-    File.open(@path,'w') { |f| f.puts data }
-    assert File.exist?(@path)
-    assert !File.directory?(@path)
+    File.open(path,'w') { |f| f.puts data }
+    assert File.exist?(path)
+    assert !File.directory?(path)
     data
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sbfaulkner-astrovan
 version: !ruby/object:Gem::Version 
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors: 
 - S. Brent Faulkner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-22 00:00:00 -08:00
+date: 2009-02-23 00:00:00 -08:00
 default_executable: 
 dependencies: []