sundae 1.0.1 → 1.0.2

data/.gitignore

@@ -0,0 +1,19 @@
+*.gem
+*.rbc
+.bundle
+.config
+coverage
+InstalledFiles
+lib/bundler/man
+pkg
+doc
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+
+# YARD artifacts
+.yardoc
+_yardoc
+doc/

data/README.rdoc

@@ -38,6 +38,10 @@ works. Like this:
     ~> ls
     bin  Desktop  doc  etc  lib  local  mnt  share  src  tmp  var  WualaDrive
 
+And that's it.  When called, Sundae creates links so that you can
+work on your files from seperate parts of life as if they were side
+by side.  
+
 == Install
 
   sudo gem install sundae
@@ -66,16 +70,22 @@ this:
   `-- collection2/
       ` ...
 
-Why is this double layer "collection" stuff going on?  Because while
-most of the time you can share a whole folder between computers,
-sometimes you want to mix your config files into a folder that also
-contains nonsymlinked files.
+Sundae will act on all of the <em>mnt</em>s--subdirectories of the
+<em>collection</em>s, that is, the sub-subdirectories of the
+<em>path</em>.  The "collections" are only there to facilitate
+grouping common files and syncronizing them between computers.
 
-For example, your ~/.ssh folder probably has a public and private key
-that you want to stay unique to that machine, but you might want to
-mix in a "config" file that has host aliases that you share between
-machines.  This is how you do that.  I do it with my .unison, .mocp,
-.ssh, and .lftp folders.
+By default, all of the contents in each of the <em>mnt</em>s are
+placed in the user's home directory.  This can be altered by creating
+a file called <tt>.sundae_path</tt> in the top of the <em>mnt</em>;
+the file should contain one line, which is the absolute path to where
+that directory should be "mounted."
+
+There's one exception to the "by default everything is placed in the
+home directory" rule.  If the mnt directory starts with "dot-" or
+"dot_" then it is placed in the dot folder formed using the rest of
+the name.  For example, the files in a "dot-ssh" mnt are placed in
+"~/.ssh" by default.
 
 For example, the hierarchy in my <em>path</em>s looks sort of like this:
 
@@ -86,13 +96,13 @@ For example, the hierarchy in my <em>path</em>s looks sort of like this:
   |   |   |-- etc/          (~/etc will point here)
   |   |   ` ...
   |   |-- dot-unison
-  |   |   |-- .sundae_path  (says "~/.unison")
+  |   |   |-- .sundae_path  (says "~/.unison", but not required)
   |   |   |-- default.prf   (~/.unison/default.prf will point here)
   |   |   `
   |   |
   |-- osx/   
-  |   |-- home_library/     (says "~/Library")
-  |   |   |-- .sundae_path
+  |   |-- home_library/     
+  |   |   |-- .sundae_path  (says "~/Library", required)
   |   |   `-- Library-Keyboard_Layouts/
   |   |       `-- Keyboard Layouts/
   |   |           ` Colemak.keylayout
@@ -112,20 +122,30 @@ For example, the hierarchy in my <em>path</em>s looks sort of like this:
   |       ` ...
   ` ...
 
-Sundae will act on all of the <em>mnt</em>s--subdirectories of the
-<em>collection</em>s, that is, the sub-subdirectories of the
-<em>path</em>.  The "collections" are only there to facilitate
-grouping common files and syncronizing them between computers.
-
-By default, all of the contents in each of the <em>mnt</em>s are
-placed in the user's home directory.  This can be altered by
-creating a file called <tt>.sundae_path</tt> in the top of the
-<em>mnt</em>; the file should contain one line, which is the
-absolute path to where that directory should be "mounted."
+Why is this double layer "collection" stuff going on?  Because while
+most of the time you can share a whole folder between computers,
+sometimes you want to mix your config files into a folder that also
+contains nonsymlinked files.
 
-And that's it.  When called, Sundae creates links so that you can
-work on your files from seperate parts of life as if they were side
-by side.  
+For example, your ~/.ssh folder probably has a public and private key
+that you want to stay unique to that machine, but you might want to
+mix in a "config" file that has host aliases that you share between
+machines.  You can put the file in "~/mnt/nix/.ssh/config" in the
+above example, and it will get created alongside the other static
+files in the "~/.ssh/" directory.
+
+However, every time you run sundae it will check the target locations
+of each file and directory (recursively) in every mnt directory for
+dangling symlinks and other stuff that sundae might have created.  If
+you put the the file in "~/mnt/nix/dot-ssh/config", it will be placed
+in the correct place and only "config" will be checked when sundae is
+run (not all of the other files in "~/.ssh/").  
+
+It obviously doesn't make much of a speed difference in this case, but
+if you're mixing in one file into "~/a/b/c/d/file", and there are lots
+of files beneath "~/a/", then you don't want sundae to look through
+everything every time it runs.  Just put it in a mnt directory with a
+<tt>.sundae_path</tt> of "~/a/b/c/d".
 
 == Author
 <don@ohspite.net>

data/lib/sundae.rb

@@ -2,6 +2,7 @@
 require 'configatron'
 require 'fileutils'
 require 'find'
+require 'pathname'
 
 # A collection of methods to mix the contents of several directories
 # together using symbolic links.
@@ -13,20 +14,21 @@ module Sundae
   # :startdoc:
   VERSION = ::File.read(PATH + 'version.txt').strip
 
-  DEFAULT_CONFIG_FILE = File.expand_path(File.join(ENV['HOME'], '.sundae'))
+  DEFAULT_CONFIG_FILE = (Pathname.new(Dir.home) + '.sundae').expand_path
  
   @config_file = DEFAULT_CONFIG_FILE
 
   # Read configuration from <tt>.sundae</tt>.
   #
   def self.load_config_file(config_file = DEFAULT_CONFIG_FILE)
-    config_file ||= DEFAULT_CONFIG_FILE
-    config_file = File.join(config_file, '.sundae') if File.directory?(config_file)
+    config_file ||= DEFAULT_CONFIG_FILE # if nil is passed
+    config_file = Pathname.new(config_file).expand_path
+    config_file += '.sundae' if config_file.directory?
 
-    create_template_config_file(config_file) unless File.file?(config_file)
+    create_template_config_file(config_file) unless config_file.file?
 
     load(config_file)
-    configatron.paths.map! { |p| File.expand_path(p) }
+    configatron.paths.map! { |p| Pathname.new(p).expand_path }
 
     # An array which lists the directories where mnts are stored.
     @paths = configatron.paths
@@ -39,13 +41,14 @@ module Sundae
   # asking the user.
   #
   def self.create_template_config_file(config_file)
+    config_file = Pathname.new(config_file).expand_path
     loop do
       print "#{config_file} does not exist.  Create template there? (y/n): "
       ans = gets.downcase.strip
       if ans == "y" || ans == "yes"
         File.open(config_file, "w") do |f|
           f.puts <<-EOM.gsub(/^ {14}/, '')
-              # -*-Ruby-*-
+              # -*-Ruby-*- 
 
               # An array which lists the directories where mnts are stored.
               configatron.paths = ["~/mnt"]
@@ -76,13 +79,15 @@ module Sundae
   # ignored (i.e., no link will be made pointing to it).
   #
   def self.ignore_file?(file) # :doc:
-    return true if File.basename(file) =~ /^\.\.?$/
-    return true if File.basename(file) == ".sundae_path"
+    file = Pathname.new(file)
+    basename = file.basename.to_s
+    return true if basename =~ /^\.\.?$/
+    return true if basename == ".sundae_path"
     @ignore_rules.each do |r| 
       if r.kind_of? Regexp
-        return true if File.basename(file) =~ r 
+        return true if basename =~ r 
       else
-        return true if File.fnmatch(r, file)
+        return true if file.fnmatch(r)
       end
     end
     return false
@@ -92,12 +97,19 @@ module Sundae
   # where in the file system links should be created for this mnt.
   #
   def self.install_location(mnt) 
-    mnt_config = File.join(mnt, '.sundae_path')
-    if File.exist?(mnt_config)
-      location = File.readlines(mnt_config)[0].strip
+    mnt = Pathname.new(mnt).expand_path
+    mnt_config = mnt + '.sundae_path'
+    if mnt_config.exist?
+      return Pathname.new(mnt_config.readlines[0].strip).expand_path
     end
 
-    location ||= ENV['HOME']
+    base = mnt.basename.to_s
+    match = (/dot[-_](.*)/).match(base)
+    if match
+      return Pathname.new(Dir.home) + ('.' + match[1])
+    end
+
+    return Pathname.new(Dir.home)
   end
 
   # Return an array of all paths in the file system where links will
@@ -111,11 +123,12 @@ module Sundae
   # as an array.
   #
   def self.mnts_in_path(path) 
+    Pathname.new(path).expand_path
     mnts = []
-    collections = Dir.entries(path).delete_if {|a| a=~/^\./}
+    collections = path.children(false).delete_if {|c| c.to_s =~ /^\./}
     collections.each do |c|
-      collection_mnts = Dir.entries(File.join(path, c)).delete_if {|a| a=~/^\./}
-      collection_mnts.map! { |mnt| File.join(c, mnt) }
+      collection_mnts = (path + c).children(false).delete_if {|c| c.to_s =~ /^\./}
+      collection_mnts.map! { |mnt| (c + mnt) }
       mnts |= collection_mnts # |= is the union
     end
 
@@ -128,87 +141,109 @@ module Sundae
     mnts = []
 
     @paths.each do |path| 
-      next unless File.exist?(path)
-      mnts |= mnts_in_path(path).map { |mnt| File.join(path, mnt) } # |= is the union operator
+      next unless path.exist?
+      mnts |= mnts_in_path(path).map { |mnt| path + mnt } # |= is the union operator
     end
-
     return mnts
   end
 
-  # Return all subdirectories of the mnts returned by all_mnts.  These
-  # are the 'mirror' directories that are generated by sundae.
+  # Return all subdirectories and files in the mnts returned by
+  # all_mnts.  These are the 'mirror' files and directories that are
+  # generated by sundae.
   #
-  def self.generated_directories 
+  def self.generated_files
     dirs = Array.new
 
     all_mnts.each do |mnt|
-      mnt_dirs = Dir.entries(mnt).delete_if { |e| ignore_file?(e) }
+      mnt_dirs = mnt.children(false).delete_if { |e| ignore_file?(e) }
       mnt_dirs.each do |dir|
-        dirs << File.join(install_location(mnt), dir)
+        dirs << (install_location(mnt) + dir)
       end
     end
 
-    return dirs.sort.uniq.select { |d| File.directory?(d) }
+    return dirs.sort.uniq#.select { |d| d.directory? }
+  end
+
+  # Return all subdirectories of the mnts returned by all_mnts.  These
+  # are the 'mirror' directories that are generated by sundae.
+  #
+  def self.generated_directories 
+    generated_files.select {|f| f.directory?} 
   end
   
   # Check for symlinks in the base directories that are missing their
   # targets.
   #
   def self.remove_dead_links
-    removed_list = []
     install_locations.each do |location|
-      next unless File.exist?(location)
-      files = Dir.entries(location).map {|f| File.join(location, f)}
+      next unless location.exist?
+      files = location.entries.map { |f| location + f }
       files.each do |file|
-        next unless File.symlink?(file)
-        next if File.exist? File.readlink(file)
-        FileUtils.rm(file)
-        removed_list << file
+        next unless file.symlink?
+        next if file.readlink.exist?
+        next unless root_path(file.readlink)
+        file.delete 
       end
     end
-    return removed_list
   end
   
+  # Search through _directory_ and return the first static file found,
+  # nil otherwise.
+  #
+  def self.find_static_file(directory)
+    directory = Pathname.new(directory).expand_path
+
+    directory.find do |path|
+      return path if path.exist? && path.ftype == 'file' 
+    end
+    return nil
+  end
+
   # Delete each generated directory if there aren't any real files in
   # them.
   #
   def self.remove_generated_directories
-    removed_list = []
     generated_directories.each do |dir| 
-      next if File.basename(dir) == ('.sundae')
-
-      # Do a search to make sure no non-symlink file is being
-      # deleted. That would suck.
-      if sf = find_static_file(dir)
-        puts "found static file: #{sf}"
-      else
-        FileUtils.rmtree(dir) 
-        removed_list << dir
-      end
+      # don't get rid of the linked config file
+      next if dir.basename.to_s == '.sundae' 
+      remove_generated_stuff dir
+
+      # if sf = find_static_file(dir)
+      #   puts "found static file: #{sf}"
+      # else
+      #   dir.rmtree
+      # end
     end
-    return removed_list
   end
 
-  # Search through _directory_ and return the first static file found,
-  # nil otherwise.
-  #
-  def self.find_static_file(directory)
-    Find.find(directory) do |path|
-      return path if File.exist?(path) && File.ftype(path) == 'file' 
+  def self.remove_generated_files
+    generated_files.each do |fod| 
+      # don't get rid of the linked config file
+      next if fod.basename.to_s == '.sundae' 
+      remove_generated_stuff fod
     end
-    return nil
   end
 
+  def self.remove_generated_stuff(fod)
+    return unless fod.exist?
+    if fod.ftype == 'directory'
+      fod.each_child do |c|
+        remove_generated_stuff c
+      end
+      fod.rmdir if fod.children.empty?
+    else
+      return unless fod.symlink?
+      fod.delete if root_path(fod.readlink) # try to only delete sundae links
+    end
+  end  
+
   # Call minimally_create_links for each mnt.
   #
   def self.create_filesystem
-    mnt_list = []
     all_mnts.each do |mnt|
-      FileUtils.mkdir_p(File.expand_path(install_location(mnt)))
+      install_location(mnt).expand_path.mkpath
       minimally_create_links(mnt, install_location(mnt))
-      mnt_list << mnt 
     end
-    return mnt_list
   end
 
   # For each directory and file in _target_, create a link at <em>link_name</em>.  If
@@ -240,11 +275,15 @@ module Sundae
   # Starting at _dir_, walk up the directory hierarchy and return the
   # directory that is contained in _@paths_.
   #
-  def self.root_path(dir)
-    raise ArgumentError if dir == '/'
+  def self.root_path(path)
+    path = Pathname.new(path).expand_path
+    last = path
+    path.ascend do |v|
+      return last if @paths.include? v
+      last = v
+    end
 
-    parent = File.expand_path(File.join(dir, '..'))
-    return (@paths.include?(parent)) ? dir : root_path(parent)
+    return nil
   end
 
   # Dispatch calls to create_directory_link and create_file_link.
@@ -266,7 +305,7 @@ module Sundae
   def self.create_file_link(target, 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)
+      raise ArgumentError, "#{link_name} cannot be overwritten for #{target}." unless File.symlink?(link_name)
       if (not File.exist?(File.readlink(link_name)))
         FileUtils.ln_sf(target, link_name)
       else
@@ -285,18 +324,19 @@ module Sundae
   #
   def self.create_directory_link(target, link_name) 
     raise ArgumentError unless File.directory?(target)
-    if (not File.exist?(link_name)) || (File.symlink?(link_name) && (not File.exist?(File.readlink(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'
-        raise "Could not link #{target} to #{link_name}"
+        raise "Could not link #{link_name} to #{target}: target exists."
       when 'directory'
         minimally_create_links(target, link_name)
       when 'link'
         case File.ftype(File.readlink(link_name))
         when 'file'
-          raise "Could not link #{target} to #{link_name}"
+          raise "Could not link #{link_name} to #{target}: another link exists there."
         when 'directory'
           combine_directories(link_name, target, File.readlink(link_name))          
         end
@@ -308,6 +348,7 @@ module Sundae
   # <em>target_path1</em> and <em>target_path2</em>.
   #
   def self.combine_directories(link_name, target_path1, target_path2) 
+    raise unless File.symlink?(link_name)
     return if target_path1 == target_path2
     
     FileUtils.rm(link_name)
@@ -318,13 +359,13 @@ module Sundae
 
   def self.update_filesystem
     remove_dead_links
-    remove_generated_directories
+    remove_generated_files
     create_filesystem
   end
 
   def self.remove_filesystem
     remove_dead_links
-    remove_generated_directories
+    remove_generated_files
   end
 
   # Return an array of mnts that are installing to +path+.

data/test/test_sundae.rb

@@ -3,41 +3,34 @@ require 'test/unit'
 $:.unshift File.join(File.dirname(__FILE__), "..", "bin") # add ../bin to the Ruby library path
 $:.unshift File.join(File.dirname(__FILE__), "..", "lib") #     ../lib
 require 'sundae'
+require 'pathname'
 
 class TestSundae < Test::Unit::TestCase
 
-  @@testdir = File.dirname(File.expand_path(__FILE__))
-  @@sandbox = File.join(@@testdir, 'sandbox')
-  @@static_dir = File.join(@@sandbox, 'static')
-  @@mnts_dir = File.join(@@sandbox, 'mnts')
+  @@testdir = Pathname.new(__FILE__).parent.expand_path
+  @@sandbox    = @@testdir + 'sandbox'
+  @@static_dir = @@sandbox + 'static'
+  @@mnts_dir   = @@sandbox + 'mnts'
 
   def setup
-    FileUtils.mkdir_p(@@sandbox)
-
-    FileUtils.mkdir_p(@@static_dir)
-    File.open(File.join(@@static_dir, 'static'), 'w')
-    FileUtils.mkdir_p(File.join(@@mnts_dir, 'c1'))
-    FileUtils.mkdir_p(File.join(@@mnts_dir, 'c2'))
-    FileUtils.mkdir_p(File.join(@@mnts_dir, 'c1/d1'))
-    FileUtils.mkdir_p(File.join(@@mnts_dir, 'c1/d2'))
-    FileUtils.mkdir_p(File.join(@@mnts_dir, 'c2/d1'))
-    FileUtils.mkdir_p(File.join(@@mnts_dir, 'c2/d3'))
-    FileUtils.mkdir_p(File.join(@@mnts_dir, 'c2/d3/d31'))
-    File.open(File.join(@@mnts_dir, 'c1/d1/f11'), 'w')
-    File.open(File.join(@@mnts_dir, 'c1/d1/f12'), 'w')
-    File.open(File.join(@@mnts_dir, 'c1/d2/f21'), 'w')
-    File.open(File.join(@@mnts_dir, 'c2/d1/f13'), 'w')
-    File.open(File.join(@@mnts_dir, 'c2/d1/f14'), 'w')
-    File.open(File.join(@@mnts_dir, 'c2/d3/f31'), 'w')
-    ['c1/d1', 'c1/d2', 'c2/d1', 'c2/d3'].each do |d|
-      File.open(File.join(@@mnts_dir, d, '.sundae_path'), 'w') do |f|
-        f.puts @@sandbox
-      end
+    @@sandbox.mkpath
+    @@static_dir.mkpath
+
+    (@@static_dir + 'static').open('w')
+    %w(c1 c2 c1/d1 c1/d2 c2/d1 c2/d3 c2/d3/d31).each do |x| 
+      (@@mnts_dir + x).mkpath
+    end
+    
+    %w(c1/d1/f11 c1/d1/f12 c1/d2/f21 c2/d1/f13 c2/d1/f14 c2/d3/f31).each do |x|
+      (@@mnts_dir + x).open('w')
     end
 
-    @@path1 = File.join(@@sandbox, 'mnts')
+    %w(c1/d1 c1/d2 c2/d1 c2/d3).each do |d|
+      (@@mnts_dir + d + '.sundae_path').open('w') {|f| f.puts @@sandbox}
+    end
 
-    @@config_file = File.join(@@sandbox, ".sundae")
+    @@path1 = @@sandbox + 'mnts'
+    @@config_file = @@sandbox + '.sundae'
     File.open(@@config_file, 'w+') do |f|
       f.puts "configatron.paths = [\"#{@@path1}\"]"
       f.puts "configatron.ignore_rules = %w("
@@ -49,24 +42,24 @@ class TestSundae < Test::Unit::TestCase
   end
 
   def teardown
-    FileUtils.rm_r(@@sandbox)
+    @@sandbox.rmtree
   end
 
   def test_class_all_mnts
     all_mnts = Sundae.all_mnts
     mnts = Sundae.mnts_in_path(@@path1)
     mnts.each do |m|
-      assert all_mnts.include?(File.join(@@path1,m))
+      assert all_mnts.include?(@@path1 + m)
     end
   end
 
   def test_class_combine_directories
-    d1 = File.join(@@mnts_dir, 'c1/d1')
-    d2 = File.join(@@mnts_dir, 'c1/d2')
-    link = File.join(@@sandbox, 'link')
+    d1   = @@mnts_dir + 'c1/d1'
+    d2   = @@mnts_dir + 'c1/d2'
+    link = @@sandbox  + 'link'
     FileUtils.ln_s(d1, link)
     Sundae.combine_directories(link, d1, d2)
-    assert File.symlink?(File.join(link, 'f11'))
+    assert File.symlink?(link + 'f11')
   end
 
   def test_class_create_directory_link
@@ -125,6 +118,12 @@ class TestSundae < Test::Unit::TestCase
     assert_equal 1, Sundae.generated_directories.size
   end
 
+  def test_class_generated_files
+    Sundae.create_filesystem
+#    assert Sundae.generated_files.include?(File.join(@@sandbox, 'f11'))
+    assert_equal 7, Sundae.generated_files.size
+  end
+
   def test_class_ignore_file_eh
     assert Sundae.ignore_file?('.sundae_path')
     assert Sundae.ignore_file?('..')
@@ -135,45 +134,45 @@ class TestSundae < Test::Unit::TestCase
   end
 
   def test_class_install_location
-    assert_equal Sundae.install_location('/'), ENV['HOME']
-    assert_equal Sundae.install_location(File.join(@@mnts_dir, 'c1/d1')), @@sandbox
+    assert_equal Pathname.new(Dir.home), Sundae.install_location('/')
+    assert_equal @@sandbox, Sundae.install_location(@@mnts_dir + 'c1/d1')
   end
 
   def test_class_install_locations
-    assert_equal Sundae.install_locations, [@@sandbox]
+    assert_equal [@@sandbox], Sundae.install_locations
   end
 
   def test_class_load_config_file
     sundae_paths = Sundae.instance_variable_get(:@paths)
-    assert_equal sundae_paths[0], File.expand_path(@@path1)
+    assert_equal sundae_paths[0], Pathname.new(@@path1).expand_path
   end
 
   def test_class_minimally_create_links
     c1 = File.join(@@mnts_dir, 'c1')
     c2 = File.join(@@mnts_dir, 'c2')
     Sundae.minimally_create_links(c1, @@sandbox)
-    assert File.symlink?(File.join(@@sandbox, 'd1'))
-    assert File.symlink?(File.join(@@sandbox, 'd2'))
+    assert((@@sandbox + 'd1').symlink?)
+    assert((@@sandbox + 'd2').symlink?)
     Sundae.minimally_create_links(c2, @@sandbox)
-    assert File.directory?(File.join(@@sandbox, 'd1'))
-    assert File.symlink?(File.join(@@sandbox, 'd1/f11'))
-    assert File.symlink?(File.join(@@sandbox, 'd1/f14'))
-    assert File.symlink?(File.join(@@sandbox, 'd2'))
-    assert File.symlink?(File.join(@@sandbox, 'd3'))
+    assert((@@sandbox + 'd1').directory?)
+    assert((@@sandbox + 'd1/f11').symlink?)
+    assert((@@sandbox + 'd1/f14').symlink?)
+    assert((@@sandbox + 'd2').symlink?)
+    assert((@@sandbox + 'd3').symlink?)
   end
 
   def test_class_mnts_in_path
-    assert_equal Sundae.mnts_in_path(@@path1), ['c1/d1', 'c1/d2', 'c2/d1', 'c2/d3']
+    assert_equal ['c1/d1', 'c1/d2', 'c2/d1', 'c2/d3'].map {|x| Pathname.new(x)},
+        Sundae.mnts_in_path(@@path1)
   end
 
   def test_class_remove_dead_links
-    File.open(File.join(@@sandbox, 'temp_file'), 'w')
-    File.open(File.join(@@sandbox, 'perm_file'), 'w')
+    (@@sandbox + 'temp_file').open('w')
+    (@@sandbox + 'perm_file').open('w')
     FileUtils.ln_s(File.join(@@sandbox, 'temp_file'), File.join(@@sandbox, 'link'))
-    FileUtils.rm(File.join(@@sandbox, 'temp_file'))
-    assert_equal Sundae.remove_dead_links, [File.join(@@sandbox, 'link')]
-    assert ! File.exist?(File.join(@@sandbox, 'link'))
-    assert File.exist?(File.join(@@sandbox, 'perm_file'))
+    (@@sandbox + 'temp_file').delete
+    assert ! (@@sandbox + 'link').exist?
+    assert (@@sandbox + 'perm_file').exist?
   end
 
   def test_class_remove_generated_directories
@@ -185,12 +184,9 @@ class TestSundae < Test::Unit::TestCase
   end
 
   def test_class_root_path
-    assert_equal Sundae.root_path(File.join(@@mnts_dir, 'c1')), File.join(@@mnts_dir, 'c1')
-    assert_equal Sundae.root_path(File.join(@@mnts_dir, 'c1/d1')), File.join(@@mnts_dir, 'c1')
-
-    assert_raise ArgumentError do
-      Sundae.root_path('/')
-    end
+    assert_equal @@mnts_dir +'c1',  Sundae.root_path(@@mnts_dir + 'c1')
+    assert_equal @@mnts_dir + 'c1', Sundae.root_path(@@mnts_dir + 'c1/d1')
+    assert_equal nil,               Sundae.root_path('/')
   end
 
   def test_class_create_link

data/unison/common

@@ -0,0 +1,17 @@
+fastcheck = true
+
+# Roots of the synchronization
+include local_mnt_path
+
+ui = text
+log = false
+auto = true
+
+# Names and paths to ignore:
+ignore = Name temp.*
+ignore = Name *~
+ignore = Name .*~
+ignore = Name *.o
+ignore = Name *.tmp
+ignore = Name .emacs_autosaves
+ignore = Name .emacs_backups

data/unison/mt_example.prf

@@ -0,0 +1,12 @@
+include common
+
+root = ssh://donmarch.org//home/14129/users/don%donmarch.org/var/unison/mnts
+sshargs = "-l don%donmarch.org"
+
+path = linux
+path = nix
+path = personal
+path = personal_private
+path = proprietorship
+path = personal_archive
+path = reference

data/version.txt

@@ -1 +1 @@
-1.0.1
+1.0.2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sundae
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-27 00:00:00.000000000 Z
+date: 2012-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &74378590 !ruby/object:Gem::Requirement
+  requirement: &79306580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.6.11
   type: :runtime
   prerelease: false
-  version_requirements: *74378590
+  version_requirements: *79306580
 - !ruby/object:Gem::Dependency
   name: configatron
-  requirement: &74378180 !ruby/object:Gem::Requirement
+  requirement: &79306020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 2.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *74378180
+  version_requirements: *79306020
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &74377570 !ruby/object:Gem::Requirement
+  requirement: &79305190 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '3.12'
   type: :runtime
   prerelease: false
-  version_requirements: *74377570
+  version_requirements: *79305190
 - !ruby/object:Gem::Dependency
   name: bones
-  requirement: &74376910 !ruby/object:Gem::Requirement
+  requirement: &79303240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: 3.7.3
   type: :development
   prerelease: false
-  version_requirements: *74376910
+  version_requirements: *79303240
 description: Mix collections of files while maintaining complete separation.
 email: don@ohspite.net
 executables:
@@ -67,6 +67,8 @@ extra_rdoc_files:
 - !binary |-
   YmluL3N1bmRhZQ==
 files:
+- !binary |-
+  LmdpdGlnbm9yZQ==
 - !binary |-
   Q0hBTkdFTE9H
 - !binary |-
@@ -81,6 +83,10 @@ files:
   bGliL3N1bmRhZS5yYg==
 - !binary |-
   dGVzdC90ZXN0X3N1bmRhZS5yYg==
+- !binary |-
+  dW5pc29uL2NvbW1vbg==
+- !binary |-
+  dW5pc29uL210X2V4YW1wbGUucHJm
 - !binary |-
   dmVyc2lvbi50eHQ=
 homepage: https://github.com/ohspite/sundae