Regenerate gemspec for version 0.9.2

Fix the path for .homesick_subdir in README.md

.gitignore

@@ -39,3 +39,9 @@ pkg
 #
 # For vim:
 *.swp
+#
+# For IDEA:
+.idea/
+*.iml
+
+Gemfile.lock

.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 2.0.0
+  - 1.9.3
+  - 1.8.7

ChangeLog.markdown

@@ -1,3 +1,25 @@
+# 0.9.2
+ * Set "dotfiles" as default castle name
+ * Introduce new commands
+     * `homesick show_path`
+     * `homesick status`
+     * `homesick diff`
+
+# 0.9.1
+ * Fixed small bugs: #35, #40
+ 
+# 0.9.0
+ * Introduce .homesick_subdir #39
+ 
+# 0.8.1
+ *Fixed `homesick list` bug on ruby 2.0 #37
+ 
+# 0.8.0
+ * Introduce commit & push command
+  * commit changes in castle and push to remote
+ * Enable recursive submodule update
+ * Git add when track
+ 
 # 0.7.0
  * Fixed double-cloning #14
  * New option for pull command: --all

Gemfile

@@ -1,4 +1,4 @@
-source :gemcutter
+source 'https://rubygems.org'
 
 # Add dependencies required to use your gem here.
 gem "thor", ">= 0.14.0"
@@ -6,10 +6,13 @@ gem "thor", ">= 0.14.0"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rake"
-  gem "rspec", "~> 2.1.0"
+  gem "rake", ">= 0.8.7"
+  gem "rspec", "~> 2.10"
   gem "jeweler", ">= 1.6.2"
-  gem "rcov", ">= 0"
+  gem "rcov", :platforms => :mri_18
+  gem "simplecov", :platforms => :mri_19
   gem "test-construct"
-  gem "ruby-debug"
+  if RUBY_VERSION >= '1.9.2'
+    gem "rubocop"
+  end
 end

Gemfile.lock

@@ -1,40 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    columnize (0.3.2)
-    diff-lcs (1.1.2)
-    git (1.2.5)
-    jeweler (1.6.2)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-    linecache (0.43)
-    rake (0.9.2)
-    rcov (0.9.9)
-    rspec (2.1.0)
-      rspec-core (~> 2.1.0)
-      rspec-expectations (~> 2.1.0)
-      rspec-mocks (~> 2.1.0)
-    rspec-core (2.1.0)
-    rspec-expectations (2.1.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.1.0)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
-    test-construct (1.2.0)
-    thor (0.14.6)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  jeweler (>= 1.6.2)
-  rake
-  rcov
-  rspec (~> 2.1.0)
-  ruby-debug
-  test-construct
-  thor (>= 0.14.0)

README.markdown

@@ -1,5 +1,7 @@
 # homesick
 
+[![Build Status](https://travis-ci.org/technicalpickles/homesick.png?branch=master)](https://travis-ci.org/technicalpickles/homesick)
+
 A man's home (directory) is his castle, so don't leave home with out it.
 
 Homesick is sorta like [rip](http://github.com/defunkt/rip), but for dotfiles. It uses git to clone a repository containing dotfiles, and saves them in `~/.homesick`. It then allows you to symlink all the dotfiles into place with a single command.
@@ -33,10 +35,100 @@ If you're not sure what castles you have around, you can easily list them:
 
     homesick list
 
+To pull your castle (or all castles):
+
+    homesick pull --all|CASTLE
+
+To commit your castle's changes:
+
+    homesick commit CASTLE
+
+To push your castle:
+
+    homesick push CASTLE
+
 Not sure what else homesick has up its sleeve? There's always the built in help:
 
     homesick help
 
+## .homesick_subdir
+
+`homesick symlink` basically makes symlink to only first depth in `castle/home`. If you want to link nested files/directories, please use .homesick_subdir.
+
+For example, when you have castle like this:
+
+    castle/home
+    `-- .config
+        `-- fooapp
+            |-- config1
+            |-- config2
+            `-- config3
+
+and have home like this:
+
+    $ tree -a
+    ~
+    |-- .config
+    |   `-- barapp
+    |         |-- config1
+    |         |-- config2
+    |         `-- config3
+    `-- .emacs.d
+        |-- elisp
+        `-- inits
+
+You may want to symlink only to `castle/home/.config/fooapp` instead of `castle/home/.config` because you already have `~/.config/barapp`. In this case, you can use .homesick_subdir. Please write "directories you want to look up sub directories (instead of just first depth)" in this file.
+
+castle/.homesick_subdir
+
+    .config
+
+and run `homesick symlink CASTLE`. The result is:
+
+    ~
+    |-- .config
+    |   |-- barapp
+    |   |     |-- config1
+    |   |     |-- config2
+    |   |     `-- config3
+    |   `-- fooapp        -> castle/home/.config/fooapp
+    `-- .emacs.d
+        |-- elisp
+        `-- inits
+
+Or `homesick track NESTED_FILE CASTLE` adds a line automatically. For example:
+
+    homesick track .emacs.d/elisp castle
+
+castle/.homesick_subdir
+
+    .config
+	.emacs.d
+
+home directory
+
+    ~
+    |-- .config
+    |   |-- barapp
+    |   |     |-- config1
+    |   |     |-- config2
+    |   |     `-- config3
+    |   `-- fooapp        -> castle/home/.config/fooapp
+    `-- .emacs.d
+        |-- elisp         -> castle/home/.emacs.d/elisp
+        `-- inits
+
+and castle
+
+    castle/home
+    |-- .config
+    |   `-- fooapp
+    |       |-- config1
+    |       |-- config2
+    |      `-- config3
+    `-- .emacs.d
+        `-- elisp
+
 ## Note on Patches/Pull Requests
  
 * Fork the project.

Rakefile

@@ -19,10 +19,10 @@ Jeweler::Tasks.new do |gem|
     Homesick is sorta like rip, but for dotfiles. It uses git to clone a repository containing dotfiles, and saves them in ~/.homesick. It then allows you to symlink all the dotfiles into place with a single command. 
 
   }
-  gem.email = "josh@technicalpickles.com"
+  gem.email = ["josh@technicalpickles.com", "info@muratayusuke.com"]
   gem.homepage = "http://github.com/technicalpickles/homesick"
-  gem.authors = ["Joshua Nichols"]
-  gem.version = "0.7.0"
+  gem.authors = ["Joshua Nichols", "Yusuke Murata"]
+  gem.version = "0.9.2"
   gem.license = "MIT"
   # Have dependencies? Add them to Gemfile
 
@@ -41,10 +41,20 @@ RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.rcov = true
 end
 
+task :rubocop do
+  if RUBY_VERSION >= '1.9.2'
+    system('rubocop')
+  end
+end
 
-task :default => :spec
+task :test do
+  Rake::Task['spec'].execute
+  Rake::Task['rubocop'].execute
+end
 
-require 'rake/rdoctask'
+task :default => :test
+
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

homesick.gemspec

@@ -4,15 +4,20 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = "homesick"
-  s.version = "0.7.0"
+  s.name = %q{homesick}
+  s.version = "0.9.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Joshua Nichols"]
-  s.date = "2012-05-28"
-  s.description = "\n    A man's home (directory) is his castle, so don't leave home with out it.\n\n    Homesick is sorta like rip, but for dotfiles. It uses git to clone a repository containing dotfiles, and saves them in ~/.homesick. It then allows you to symlink all the dotfiles into place with a single command. \n\n  "
-  s.email = "josh@technicalpickles.com"
-  s.executables = ["homesick"]
+  s.authors = [%q{Joshua Nichols}, %q{Yusuke Murata}]
+  s.date = %q{2013-06-27}
+  s.description = %q{
+    A man's home (directory) is his castle, so don't leave home with out it.
+
+    Homesick is sorta like rip, but for dotfiles. It uses git to clone a repository containing dotfiles, and saves them in ~/.homesick. It then allows you to symlink all the dotfiles into place with a single command. 
+
+  }
+  s.email = [%q{josh@technicalpickles.com}, %q{info@muratayusuke.com}]
+  s.executables = [%q{homesick}]
   s.extra_rdoc_files = [
     "ChangeLog.markdown",
     "LICENSE",
@@ -21,9 +26,9 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".rspec",
+    ".travis.yml",
     "ChangeLog.markdown",
     "Gemfile",
-    "Gemfile.lock",
     "LICENSE",
     "README.markdown",
     "Rakefile",
@@ -36,40 +41,40 @@ Gem::Specification.new do |s|
     "spec/spec.opts",
     "spec/spec_helper.rb"
   ]
-  s.homepage = "http://github.com/technicalpickles/homesick"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.15"
-  s.summary = "A man's home is his castle. Never leave your dotfiles behind."
+  s.homepage = %q{http://github.com/technicalpickles/homesick}
+  s.licenses = [%q{MIT}]
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.5}
+  s.summary = %q{A man's home is his castle. Never leave your dotfiles behind.}
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<thor>, [">= 0.14.0"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.1.0"])
+      s.add_development_dependency(%q<rake>, [">= 0.8.7"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.10"])
       s.add_development_dependency(%q<jeweler>, [">= 1.6.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
       s.add_development_dependency(%q<test-construct>, [">= 0"])
-      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
     else
       s.add_dependency(%q<thor>, [">= 0.14.0"])
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 2.1.0"])
+      s.add_dependency(%q<rake>, [">= 0.8.7"])
+      s.add_dependency(%q<rspec>, ["~> 2.10"])
       s.add_dependency(%q<jeweler>, [">= 1.6.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
       s.add_dependency(%q<test-construct>, [">= 0"])
-      s.add_dependency(%q<ruby-debug>, [">= 0"])
     end
   else
     s.add_dependency(%q<thor>, [">= 0.14.0"])
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 2.1.0"])
+    s.add_dependency(%q<rake>, [">= 0.8.7"])
+    s.add_dependency(%q<rspec>, ["~> 2.10"])
     s.add_dependency(%q<jeweler>, [">= 1.6.2"])
     s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
     s.add_dependency(%q<test-construct>, [">= 0"])
-    s.add_dependency(%q<ruby-debug>, [">= 0"])
   end
 end
 

lib/homesick.rb

@@ -10,19 +10,22 @@ class Homesick < Thor
   add_runtime_options!
 
   GITHUB_NAME_REPO_PATTERN = /\A([A-Za-z_-]+\/[A-Za-z_-]+)\Z/
+  SUBDIR_FILENAME = '.homesick_subdir'
+
+  DEFAULT_CASTLE_NAME = 'dotfiles'
 
   def initialize(args = [], options = {}, config = {})
     super
     self.shell = Homesick::Shell.new
   end
 
-  desc "clone URI", "Clone +uri+ as a castle for homesick"
+  desc 'clone URI', 'Clone +uri+ as a castle for homesick'
   def clone(uri)
     inside repos_dir do
       destination = nil
       if File.exist?(uri)
         uri = Pathname.new(uri).expand_path
-        if uri.to_s.start_with?(repos_dir)
+        if uri.to_s.start_with?(repos_dir.to_s)
           raise "Castle already cloned to #{uri}"
         end
 
@@ -32,7 +35,7 @@ class Homesick < Thor
       elsif uri =~ GITHUB_NAME_REPO_PATTERN
         destination = Pathname.new($1)
         git_clone "git://github.com/#{$1}.git", :destination => destination
-      elsif uri =~ /\/([^\/]*)(\.git)?\Z/
+      elsif uri =~ /%r([^%r]*?)(\.git)?\Z/
         destination = Pathname.new($1)
         git_clone uri
       elsif uri =~ /[^:]+:([^:]+)(\.git)?\Z/
@@ -53,20 +56,20 @@ class Homesick < Thor
       if homesickrc.exist?
         proceed = shell.yes?("#{uri} has a .homesickrc. Proceed with evaling it? (This could be destructive)")
         if proceed
-          shell.say_status "eval", homesickrc
+          shell.say_status 'eval', homesickrc
           inside destination do
             eval homesickrc.read, binding, homesickrc.expand_path
           end
         else
-          shell.say_status "eval skip", "not evaling #{homesickrc}, #{destination} may need manual configuration", :blue
+          shell.say_status 'eval skip', "not evaling #{homesickrc}, #{destination} may need manual configuration", :blue
         end
       end
     end
   end
 
-  desc "pull NAME", "Update the specified castle"
-  method_option :all, :type => :boolean, :default => false, :required => false, :desc => "Update all cloned castles"
-  def pull(name="")
+  desc 'pull CASTLE', 'Update the specified castle'
+  method_option :all, :type => :boolean, :default => false, :required => false, :desc => 'Update all cloned castles'
+  def pull(name = DEFAULT_CASTLE_NAME)
     if options[:all]
       inside_each_castle do |castle|
         shell.say castle.to_s.gsub(repos_dir.to_s + '/', '') + ':'
@@ -78,54 +81,114 @@ class Homesick < Thor
 
   end
 
-  desc "symlink NAME", "Symlinks all dotfiles from the specified castle"
-  def symlink(name)
-    check_castle_existance(name, "symlink")
+  desc 'commit CASTLE', "Commit the specified castle's changes"
+  def commit(name = DEFAULT_CASTLE_NAME)
+    commit_castle name
+
+  end
+
+  desc 'push CASTLE', 'Push the specified castle'
+  def push(name = DEFAULT_CASTLE_NAME)
+    push_castle name
+
+  end
+
+  desc 'symlink CASTLE', 'Symlinks all dotfiles from the specified castle'
+  method_option :force, :default => false, :desc => 'Overwrite existing conflicting symlinks without prompting.'
+  def symlink(name = DEFAULT_CASTLE_NAME)
+    check_castle_existance(name, 'symlink')
 
     inside castle_dir(name) do
-      files = Pathname.glob('.*').reject{|a| [".",".."].include?(a.to_s)}
-      files.each do |path|
-        absolute_path = path.expand_path
+      subdirs = subdirs(name)
 
-        inside home_dir do
-          adjusted_path = (home_dir + path).basename
+      # link files
+      symlink_each(name, castle_dir(name), subdirs)
 
-          ln_s absolute_path, adjusted_path
-        end
+      # link files in subdirs
+      subdirs.each do |subdir|
+        symlink_each(name, subdir, subdirs)
       end
     end
   end
 
-  desc "track FILE CASTLE", "add a file to a castle"
-  def track(file, castle)
+  desc 'track FILE CASTLE', 'add a file to a castle'
+  def track(file, castle = DEFAULT_CASTLE_NAME)
     castle = Pathname.new(castle)
-    file = Pathname.new(file)
+    file = Pathname.new(file.chomp('/'))
     check_castle_existance(castle, 'track')
 
     absolute_path = file.expand_path
-    castle_path = castle_dir(castle)
+    relative_dir = absolute_path.relative_path_from(home_dir).dirname
+    castle_path = Pathname.new(castle_dir(castle)).join(relative_dir)
+    FileUtils.mkdir_p castle_path
+
+    # Are we already tracking this or anything inside it?
+    target = Pathname.new(castle_path.join(file.basename))
+    if target.exist?
+      if absolute_path.directory?
+        move_dir_contents(target, absolute_path)
+        absolute_path.rmtree
+        subdir_remove(castle, relative_dir + file.basename)
+
+      elsif more_recent? absolute_path, target
+        target.delete
         mv absolute_path, castle_path
+      else
+        shell.say_status(:track, "#{target} already exists, and is more recent than #{file}. Run 'homesick SYMLINK CASTLE' to create symlinks.", :blue) unless options[:quiet]
+      end
+    else
+      mv absolute_path, castle_path
+    end
 
     inside home_dir do
-      absolute_path = castle_dir(castle) + file.basename
-      home_path = home_dir + file
+      absolute_path = castle_path + file.basename
+      home_path = home_dir + relative_dir + file.basename
       ln_s absolute_path, home_path
     end
+
+    inside castle_path do
+      git_add absolute_path
     end
 
-  desc "list", "List cloned castles"
+    # are we tracking something nested? Add the parent dir to the manifest
+    subdir_add(castle, relative_dir) unless relative_dir.eql?(Pathname.new('.'))
+  end
+
+  desc 'list', 'List cloned castles'
   def list
     inside_each_castle do |castle|
-      say_status castle.relative_path_from(repos_dir), `git config remote.origin.url`.chomp, :cyan
+      say_status castle.relative_path_from(repos_dir).to_s, `git config remote.origin.url`.chomp, :cyan
     end
   end
 
-  desc "generate PATH", "generate a homesick-ready git repo at PATH"
+  desc 'status CASTLE', 'Shows the git status of a castle'
+  def status(castle = DEFAULT_CASTLE_NAME)
+    check_castle_existance(castle, 'status')
+    inside repos_dir.join(castle) do
+      git_status
+    end
+  end
+
+  desc 'diff CASTLE', 'Shows the git diff of uncommitted changes in a castle'
+  def diff(castle = DEFAULT_CASTLE_NAME)
+    check_castle_existance(castle, 'diff')
+    inside repos_dir.join(castle) do
+      git_diff
+    end
+  end
+
+  desc 'show_path CASTLE', 'Prints the path of a castle'
+  def show_path(castle = DEFAULT_CASTLE_NAME)
+    check_castle_existance(castle, 'show_path')
+    say repos_dir.join(castle)
+  end
+
+  desc 'generate PATH', 'generate a homesick-ready git repo at PATH'
   def generate(castle)
     castle = Pathname.new(castle).expand_path
 
     github_user = `git config github.user`.chomp
-    github_user = nil if github_user == ""
+    github_user = nil if github_user == ''
     github_repo = castle.basename
 
     empty_directory castle
@@ -136,7 +199,7 @@ class Homesick < Thor
         git_remote_add 'origin', url
       end
 
-      empty_directory "home"
+      empty_directory 'home'
     end
   end
 
@@ -164,10 +227,12 @@ class Homesick < Thor
   end
 
   def all_castles
-    dirs = Pathname.glob("#{repos_dir}/**/*/.git")
+    dirs = Pathname.glob("#{repos_dir}/**/.git", File::FNM_DOTMATCH)
     # reject paths that lie inside another castle, like git submodules
     return dirs.reject do |dir|
-      dirs.any? {|other| dir != other && dir.fnmatch(other.parent.join('*').to_s) }
+      dirs.any? do |other|
+        dir != other && dir.fnmatch(other.parent.join('*').to_s)
+      end
     end
   end
 
@@ -181,11 +246,122 @@ class Homesick < Thor
   end
 
   def update_castle(castle)
-    check_castle_existance(castle, "pull")
+    check_castle_existance(castle, 'pull')
     inside repos_dir.join(castle) do
       git_pull
       git_submodule_init
       git_submodule_update
     end
   end
+
+  def commit_castle(castle)
+    check_castle_existance(castle, 'commit')
+    inside repos_dir.join(castle) do
+      git_commit_all
+    end
+  end
+
+  def push_castle(castle)
+    check_castle_existance(castle, 'push')
+    inside repos_dir.join(castle) do
+      git_push
+    end
+  end
+
+  def subdir_file(castle)
+    repos_dir.join(castle, SUBDIR_FILENAME)
+  end
+
+  def subdirs(castle)
+    subdir_filepath = subdir_file(castle)
+    subdirs = []
+    if subdir_filepath.exist?
+      subdir_filepath.readlines.each do |subdir|
+        subdirs.push(subdir.chomp)
+      end
+    end
+    subdirs
+  end
+
+  def subdir_add(castle, path)
+    subdir_filepath = subdir_file(castle)
+    File.open(subdir_filepath, 'a+') do |subdir|
+      subdir.puts path unless subdir.readlines.reduce(false) do |memo, line|
+        line.eql?("#{path.to_s}\n") || memo
+      end
+    end
+
+    inside castle_dir(castle) do
+      git_add subdir_filepath
+    end
+  end
+
+  def subdir_remove(castle, path)
+    subdir_filepath = subdir_file(castle)
+    if subdir_filepath.exist?
+      lines = IO.readlines(subdir_filepath).delete_if { |line| line == "#{path}\n" }
+      File.open(subdir_filepath, 'w') { |manfile| manfile.puts lines }
+    end
+
+    inside castle_dir(castle) do
+      git_add subdir_filepath
+    end
+  end
+
+  def move_dir_contents(target, dir_path)
+    child_files = dir_path.children
+    child_files.each do |child|
+
+      target_path = target.join(child.basename)
+      if target_path.exist?
+        if more_recent?(child, target_path) && target.file?
+          target_path.delete
+          mv child, target
+        end
+        next
+      end
+
+      mv child, target
+    end
+  end
+
+  def more_recent?(first, second)
+    first_p = Pathname.new(first)
+    second_p = Pathname.new(second)
+    first_p.mtime > second_p.mtime && !first_p.symlink?
+  end
+
+  def symlink_each(castle, basedir, subdirs)
+    absolute_basedir = Pathname.new(basedir).expand_path
+    inside basedir do
+      files = Pathname.glob('{.*,*}').reject{ |a| ['.', '..'].include?(a.to_s) }
+      files.each do |path|
+        absolute_path = path.expand_path
+        castle_home = castle_dir(castle)
+
+        # make ignore dirs
+        ignore_dirs = []
+        subdirs.each do |subdir|
+          # ignore all parent of each line in subdir file
+          Pathname.new(subdir).ascend do |p|
+            ignore_dirs.push(p)
+          end
+        end
+
+        # ignore dirs written in subdir file
+        matched = false
+        ignore_dirs.uniq.each do |ignore_dir|
+          if absolute_path == castle_home.join(ignore_dir)
+            matched = true
+            break
+          end
+        end
+        next if matched
+
+        relative_dir = absolute_basedir.relative_path_from(castle_home)
+        home_path = home_dir.join(relative_dir).join(path)
+        ln_s absolute_path, home_path
+      end
+    end
+  end
 end

lib/homesick/actions.rb

@@ -3,10 +3,7 @@ class Homesick
     # TODO move this to be more like thor's template, empty_directory, etc
     def git_clone(repo, config = {})
       config ||= {}
-      destination = config[:destination] || begin
-        repo =~ /([^\/]+)\.git$/
-       $1
-      end
+      destination = config[:destination] || File.basename(repo, '.git')
 
       destination = Pathname.new(destination) unless destination.kind_of?(Pathname)
       FileUtils.mkdir_p destination.dirname
@@ -19,13 +16,13 @@ class Homesick
       end
     end
 
-    def git_init(path = ".")
+    def git_init(path = '.')
       path = Pathname.new(path)
 
       inside path do
-        unless path.join('.git').exist?
+        if !path.join('.git').exist?
           say_status 'git init', '' unless options[:quiet]
-          system "git init >/dev/null" unless options[:pretend]
+          system 'git init >/dev/null' unless options[:pretend]
         else
           say_status 'git init', 'already initialized', :blue unless options[:quiet]
         end
@@ -36,7 +33,7 @@ class Homesick
       existing_remote = `git config remote.#{name}.url`.chomp
       existing_remote = nil if existing_remote == ''
 
-      unless existing_remote
+      if !existing_remote
         say_status 'git remote', "add #{name} #{url}" unless options[:quiet]
         system "git remote add #{name} #{url}" unless options[:pretend]
       else
@@ -46,17 +43,42 @@ class Homesick
 
     def git_submodule_init(config = {})
       say_status 'git submodule', 'init', :green unless options[:quiet]
-      system "git submodule --quiet init" unless options[:pretend]
+      system 'git submodule --quiet init' unless options[:pretend]
     end
 
     def git_submodule_update(config = {})
       say_status 'git submodule', 'update', :green unless options[:quiet]
-      system "git submodule --quiet update >/dev/null 2>&1" unless options[:pretend]
+      system 'git submodule --quiet update --init --recursive >/dev/null 2>&1' unless options[:pretend]
     end
 
     def git_pull(config = {})
       say_status 'git pull', '', :green unless options[:quiet]
-      system "git pull --quiet" unless options[:pretend]
+      system 'git pull --quiet' unless options[:pretend]
+    end
+
+    def git_push(config = {})
+      say_status 'git push', '', :green unless options[:quiet]
+      system 'git push' unless options[:pretend]
+    end
+
+    def git_commit_all(config = {})
+      say_status 'git commit all', '', :green unless options[:quiet]
+      system 'git commit -v -a' unless options[:pretend]
+    end
+
+    def git_add(file, config = {})
+      say_status 'git add file', '', :green unless options[:quiet]
+      system "git add #{file}" unless options[:pretend]
+    end
+
+    def git_status(config = {})
+      say_status 'git status', '', :green unless options[:quiet]
+      system "git status" unless options[:pretend]
+    end
+
+    def git_diff(config = {})
+      say_status 'git diff', '', :green unless options[:quiet]
+      system "git diff" unless options[:pretend]
     end
 
     def mv(source, destination, config = {})
@@ -78,6 +100,7 @@ class Homesick
     def ln_s(source, destination, config = {})
       source = Pathname.new(source)
       destination = Pathname.new(destination)
+      FileUtils.mkdir_p destination.dirname
 
       if destination.symlink?
         if destination.readlink == source
@@ -86,13 +109,14 @@ class Homesick
           say_status :conflict, "#{destination} exists and points to #{destination.readlink}", :red unless options[:quiet]
 
           if options[:force] || shell.file_collision(destination) { source }
-            system "ln -sf #{source} #{destination}" unless options[:pretend]
+            system "ln -nsf #{source} #{destination}" unless options[:pretend]
           end
         end
       elsif destination.exist?
         say_status :conflict, "#{destination} exists", :red unless options[:quiet]
 
         if options[:force] || shell.file_collision(destination) { source }
+          system "rm -rf #{destination}" unless options[:pretend]
           system "ln -sf #{source} #{destination}" unless options[:pretend]
         end
       else

spec/homesick_spec.rb

@@ -1,146 +1,341 @@
 require 'spec_helper'
 
-describe "homesick" do
-  before do
-    @homesick = Homesick.new
-  end
+describe 'homesick' do
+  let(:home) { create_construct }
+  after { home.destroy! }
 
-  describe "clone" do
-    context "of a file" do
-      it "should symlink existing directories" do
+  let(:castles) { home.directory('.homesick/repos') }
+
+  let(:homesick) { Homesick.new }
+
+  before { homesick.stub!(:repos_dir).and_return(castles) }
+
+  describe 'clone' do
+    context 'of a file' do
+      it 'should symlink existing directories' do
         somewhere = create_construct
-        somewhere.directory('wtf')
-        wtf = somewhere + 'wtf'
+        local_repo = somewhere.directory('wtf')
 
-        @homesick.should_receive(:ln_s).with(wtf, wtf.basename)
+        homesick.clone local_repo
 
-        @homesick.clone wtf
+        castles.join('wtf').readlink.should == local_repo
       end
 
-      context "when it exists in a repo directory" do
+      context 'when it exists in a repo directory' do
         before do
-          @repos_dir = create_construct
-          @existing_dir = @repos_dir.directory('existing_castle')
-          @homesick.stub!(:repos_dir).and_return(@repos_dir)
+          existing_castle = given_castle('existing_castle')
+          @existing_dir = existing_castle.parent
         end
 
-        it "should not symlink" do
-          @homesick.should_not_receive(:git_clone)
-
-          @homesick.clone @existing_dir.to_s rescue nil
-        end
-
-        it "should raise an error" do
-          @existing_castle = @homesick.send(:repos_dir) + 'existing_castle'
-          lambda {
-            @homesick.clone @existing_castle.to_s
-          }.should raise_error(/already cloned/i)
+        it 'should raise an error' do
+          homesick.should_not_receive(:git_clone)
+          expect { homesick.clone @existing_dir.to_s }.to raise_error(/already cloned/i)
         end
       end
     end
 
-    it "should clone git repo like git://host/path/to.git" do
-      @homesick.should_receive(:git_clone).with('git://github.com/technicalpickles/pickled-vim.git')
+    it 'should clone git repo like file:///path/to.git' do
+      bare_repo = File.join(create_construct.to_s, 'dotfiles.git')
+      system "git init --bare #{bare_repo} >/dev/null 2>&1"
 
-      @homesick.clone "git://github.com/technicalpickles/pickled-vim.git"
+      homesick.clone "file://#{bare_repo}"
+      File.directory?(File.join(home.to_s, '.homesick/repos/dotfiles')).should be_true
     end
 
-    it "should clone git repo like git@host:path/to.git" do
-      @homesick.should_receive(:git_clone).with('git@github.com:technicalpickles/pickled-vim.git')
+    it 'should clone git repo like git://host/path/to.git' do
+      homesick.should_receive(:git_clone).with('git://github.com/technicalpickles/pickled-vim.git')
 
-      @homesick.clone 'git@github.com:technicalpickles/pickled-vim.git'
+      homesick.clone 'git://github.com/technicalpickles/pickled-vim.git'
     end
 
-    it "should clone git repo like http://host/path/to.git" do
-      @homesick.should_receive(:git_clone).with('http://github.com/technicalpickles/pickled-vim.git')
+    it 'should clone git repo like git@host:path/to.git' do
+      homesick.should_receive(:git_clone).with('git@github.com:technicalpickles/pickled-vim.git')
 
-      @homesick.clone 'http://github.com/technicalpickles/pickled-vim.git'
+      homesick.clone 'git@github.com:technicalpickles/pickled-vim.git'
     end
 
-    it "should clone git repo like http://host/path/to" do
-      @homesick.should_receive(:git_clone).with('http://github.com/technicalpickles/pickled-vim')
+    it 'should clone git repo like http://host/path/to.git' do
+      homesick.should_receive(:git_clone).with('http://github.com/technicalpickles/pickled-vim.git')
 
-      @homesick.clone 'http://github.com/technicalpickles/pickled-vim'
+      homesick.clone 'http://github.com/technicalpickles/pickled-vim.git'
     end
 
-    it "should clone git repo like host-alias:repos.git" do
-      @homesick.should_receive(:git_clone).with('gitolite:pickled-vim.git')
+    it 'should clone git repo like http://host/path/to' do
+      homesick.should_receive(:git_clone).with('http://github.com/technicalpickles/pickled-vim')
 
-      @homesick.clone 'gitolite:pickled-vim.git'
+      homesick.clone 'http://github.com/technicalpickles/pickled-vim'
     end
 
-    it "should not try to clone a malformed uri like malformed" do
-      @homesick.should_not_receive(:git_clone)
+    it 'should clone git repo like host-alias:repos.git' do
+      homesick.should_receive(:git_clone).with('gitolite:pickled-vim.git')
 
-      @homesick.clone 'malformed' rescue nil
+      homesick.clone 'gitolite:pickled-vim.git'
     end
 
-    it "should throw an exception when trying to clone a malformed uri like malformed" do
-      lambda {
-        @homesick.clone 'malformed'
-      }.should raise_error
+    it 'should throw an exception when trying to clone a malformed uri like malformed' do
+      homesick.should_not_receive(:git_clone)
+      expect { homesick.clone 'malformed' }.to raise_error
     end
 
-    it "should clone a github repo" do
-      @homesick.should_receive(:git_clone).with('git://github.com/wfarr/dotfiles.git', :destination => Pathname.new('wfarr/dotfiles'))
+    it 'should clone a github repo' do
+      homesick.should_receive(:git_clone).with('git://github.com/wfarr/dotfiles.git', :destination => Pathname.new('wfarr/dotfiles'))
 
-      @homesick.clone "wfarr/dotfiles"
+      homesick.clone 'wfarr/dotfiles'
     end
   end
 
-  describe "list" do
+  describe 'symlink' do
+    let(:castle) { given_castle('glencairn') }
 
-    # FIXME only passes in isolation. need to setup data a bit better
-    xit "should say each castle in the castle directory" do
-      @user_dir.directory '.homesick/repos' do |repos_dir|
-        repos_dir.directory 'zomg' do |zomg|
-          Dir.chdir do
-            system "git init >/dev/null 2>&1"
-            system "git remote add origin git://github.com/technicalpickles/zomg.git >/dev/null 2>&1"
+    it 'links dotfiles from a castle to the home folder' do
+      dotfile = castle.file('.some_dotfile')
+
+      homesick.symlink('glencairn')
+
+      home.join('.some_dotfile').readlink.should == dotfile
+    end
+
+    it 'links non-dotfiles from a castle to the home folder' do
+      dotfile = castle.file('bin')
+
+      homesick.symlink('glencairn')
+
+      home.join('bin').readlink.should == dotfile
+    end
+
+    context 'when forced' do
+      let(:homesick) { Homesick.new [], :force => true }
+
+      it 'can override symlinks to directories' do
+        somewhere_else = create_construct
+        existing_dotdir_link = home.join('.vim')
+        FileUtils.ln_s somewhere_else, existing_dotdir_link
+
+        dotdir = castle.directory('.vim')
+
+        homesick.symlink('glencairn')
+
+        existing_dotdir_link.readlink.should == dotdir
+      end
+
+      it 'can override existing directory' do
+        existing_dotdir = home.directory('.vim')
+
+        dotdir = castle.directory('.vim')
+
+        homesick.symlink('glencairn')
+
+        existing_dotdir.readlink.should == dotdir
       end
     end
 
-        repos_dir.directory 'wtf/zomg' do |zomg|
-          Dir.chdir do
-            system "git init >/dev/null 2>&1"
-            system "git remote add origin git://github.com/technicalpickles/zomg.git >/dev/null 2>&1"
-          end
-        end
-      end 
-      @homesick.should_receive(:say_status).with("zomg", "git://github.com/technicalpickles/zomg.git", :cyan)
-      @homesick.should_receive(:say_status).with("wtf/zomg", "git://github.com/technicalpickles/zomg.git", :cyan)
+    context "with '.config' in .homesick_subdir" do
+      let(:castle) { given_castle('glencairn', ['.config']) }
+      it 'can symlink in sub directory' do
+        dotdir = castle.directory('.config')
+        dotfile = dotdir.file('.some_dotfile')
 
-      @homesick.list
+        homesick.symlink('glencairn')
+
+        home_dotdir = home.join('.config')
+        home_dotdir.symlink?.should be == false
+        home_dotdir.join('.some_dotfile').readlink.should == dotfile
       end
     end
 
-  describe "pull" do
+    context "with '.config/appA' in .homesick_subdir" do
+      let(:castle) { given_castle('glencairn', ['.config/appA']) }
+      it 'can symlink in nested sub directory' do
+        dotdir = castle.directory('.config').directory('appA')
+        dotfile = dotdir.file('.some_dotfile')
 
-    xit "needs testing"
+        homesick.symlink('glencairn')
 
-    describe "--all" do
-      xit "needs testing"
+        home_dotdir = home.join('.config').join('appA')
+        home_dotdir.symlink?.should be == false
+        home_dotdir.join('.some_dotfile').readlink.should == dotfile
+      end
+    end
+
+    context "with '.config' and '.config/someapp' in .homesick_subdir" do
+      let(:castle) { given_castle('glencairn', ['.config', '.config/someapp']) }
+      it 'can symlink under both of .config and .config/someapp' do
+        config_dir = castle.directory('.config')
+        config_dotfile = config_dir.file('.some_dotfile')
+        someapp_dir = config_dir.directory('someapp')
+        someapp_dotfile = someapp_dir.file('.some_appfile')
+
+        homesick.symlink('glencairn')
+
+        home_config_dir = home.join('.config')
+        home_someapp_dir = home_config_dir.join('someapp')
+        home_config_dir.symlink?.should be == false
+        home_config_dir.join('.some_dotfile').readlink.should be == config_dotfile
+        home_someapp_dir.symlink?.should be == false
+        home_someapp_dir.join('.some_appfile').readlink.should == someapp_dotfile
+      end
+    end
+
+    context "when call with no castle name" do
+      let(:castle) { given_castle('dotfiles') }
+      it 'using default castle name: "dotfiles"' do
+        dotfile = castle.file('.some_dotfile')
+
+        homesick.symlink
+
+        home.join('.some_dotfile').readlink.should == dotfile
+      end
+    end
+  end
+
+  describe 'list' do
+    it 'should say each castle in the castle directory' do
+      given_castle('zomg')
+      given_castle('wtf/zomg')
+
+      homesick.should_receive(:say_status).with('zomg', 'git://github.com/technicalpickles/zomg.git', :cyan)
+      homesick.should_receive(:say_status).with('wtf/zomg', 'git://github.com/technicalpickles/zomg.git', :cyan)
+
+      homesick.list
+    end
+  end
+
+  describe 'status' do
+
+    xit 'needs testing'
+
+  end
+
+  describe 'diff' do
+
+    xit 'needs testing'
+
+  end
+
+  describe 'show_path' do
+    it 'should say the path of a castle' do
+      castle = given_castle('castle_repo')
+
+      homesick.should_receive(:say).with(castle.dirname)
+
+      homesick.show_path('castle_repo')
+    end
+  end
+
+  describe 'pull' do
+
+    xit 'needs testing'
+
+    describe '--all' do
+      xit 'needs testing'
     end
 
   end
 
-  describe "track" do
-    it "should move the tracked file into the castle" do
-      some_rc_file = @user_dir.file '.some_rc_file'
-      homesickrepo = @user_dir.directory('.homesick').directory('repos').directory('castle_repo')
-      castle_path = homesickrepo.directory 'home'
+  describe 'commit' do
+
+    xit 'needs testing'
 
-      # There is some hideous thing going on with construct; rming the file I'm moving works on this test.
-      # Otherwise when track ln_s's it back out, it sees a conflict. Its as if file operations don't
-      # actually effect this thing, or something.
-      system "rm #{some_rc_file.to_s}"
-      Dir.chdir homesickrepo do
-        system "git init >/dev/null 2>&1"
   end
 
-      @homesick.should_receive(:mv).with(some_rc_file, castle_path)
-      @homesick.should_receive(:ln_s).with(castle_path +  some_rc_file.basename, some_rc_file)
-      @homesick.track(some_rc_file.to_s, 'castle_repo')
+  describe 'push' do
+
+    xit 'needs testing'
+
+  end
+
+  describe 'track' do
+    it 'should move the tracked file into the castle' do
+      castle = given_castle('castle_repo')
+
+      some_rc_file = home.file '.some_rc_file'
+
+      homesick.track(some_rc_file.to_s, 'castle_repo')
+
+      tracked_file = castle.join('.some_rc_file')
+      tracked_file.should exist
+
+      some_rc_file.readlink.should == tracked_file
+    end
+
+    it 'should track a file in nested folder structure' do
+      castle = given_castle('castle_repo')
+
+      some_nested_file = home.file('some/nested/file.txt')
+      homesick.track(some_nested_file.to_s, 'castle_repo')
+
+      tracked_file = castle.join('some/nested/file.txt')
+      tracked_file.should exist
+      some_nested_file.readlink.should == tracked_file
+    end
+
+    it 'should track a nested directory' do
+      castle = given_castle('castle_repo')
+
+      some_nested_dir = home.directory('some/nested/directory/')
+      homesick.track(some_nested_dir.to_s, 'castle_repo')
+
+      tracked_file = castle.join('some/nested/directory/')
+      tracked_file.should exist
+      some_nested_dir.realpath.should == tracked_file.realpath
+    end
+
+    context "when call with no castle name" do
+      it 'using default castle name: "dotfiles"' do
+        castle = given_castle('dotfiles')
+
+        some_rc_file = home.file '.some_rc_file'
+
+        homesick.track(some_rc_file.to_s)
+
+        tracked_file = castle.join('.some_rc_file')
+        tracked_file.should exist
+
+        some_rc_file.readlink.should == tracked_file
+      end
+    end
+
+    describe 'subdir_file' do
+
+      it 'should add the nested files parent to the subdir_file' do
+        castle = given_castle('castle_repo')
+
+        some_nested_file = home.file('some/nested/file.txt')
+        homesick.track(some_nested_file.to_s, 'castle_repo')
+
+        subdir_file = castle.parent.join(Homesick::SUBDIR_FILENAME)
+        File.open(subdir_file, 'r') do |f|
+          f.readline.should == "some/nested\n"
+        end
+      end
+
+      it 'should NOT add anything if the files parent is already listed' do
+        castle = given_castle('castle_repo')
+
+        some_nested_file = home.file('some/nested/file.txt')
+        other_nested_file = home.file('some/nested/other.txt')
+        homesick.track(some_nested_file.to_s, 'castle_repo')
+        homesick.track(other_nested_file.to_s, 'castle_repo')
+
+        subdir_file = castle.parent.join(Homesick::SUBDIR_FILENAME)
+        File.open(subdir_file, 'r') do |f|
+          f.readlines.size.should == 1
+        end
+      end
+
+      it 'should remove the parent of a tracked file from the subdir_file if the parent itself is tracked' do
+        castle = given_castle('castle_repo')
+
+        some_nested_file = home.file('some/nested/file.txt')
+        nested_parent = home.directory('some/nested/')
+        homesick.track(some_nested_file.to_s, 'castle_repo')
+        homesick.track(nested_parent.to_s, 'castle_repo')
+
+        subdir_file = castle.parent.join(Homesick::SUBDIR_FILENAME)
+        File.open(subdir_file, 'r') do |f|
+          f.each_line { |line| line.should_not == "some/nested\n" }
+        end
+      end
     end
   end
 end

spec/spec_helper.rb

@@ -5,15 +5,31 @@ require 'rspec'
 require 'rspec/autorun'
 require 'construct'
 
-Rspec.configure do |config|
+RSpec.configure do |config|
   config.include Construct::Helpers
 
-  config.before do
-    @user_dir = create_construct
-    ENV['HOME'] = @user_dir.to_s
+  config.before { ENV['HOME'] = home.to_s }
+
+  config.before { silence! }
+
+  def silence!
+    homesick.stub(:say_status)
   end
 
-  config.after do
-    @user_dir.destroy!
+  def given_castle(path, subdirs = [])
+    name = Pathname.new(path).basename
+    castles.directory(path) do |castle|
+      Dir.chdir(castle) do
+        system 'git init >/dev/null 2>&1'
+        system "git remote add origin git://github.com/technicalpickles/#{name}.git >/dev/null 2>&1"
+        if subdirs
+          subdir_file = castle.join(Homesick::SUBDIR_FILENAME)
+          subdirs.each do |subdir|
+            system "echo #{subdir} >> #{subdir_file}"
+          end
+        end
+        return castle.directory('home')
+      end
+    end
   end
 end