Regenerate gemspec for version 0.9.1

Remove .git suffix on destination directory if URL ends with it.

.gitignore

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

.rspec

@@ -0,0 +1 @@
+--color

.travis.yml

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

ChangeLog.markdown

@@ -1,3 +1,35 @@
+# 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
+  * pulls each castle, instead of just one
+
+# 0.6.1
+
+ * Add a license
+
+# 0.6.0
+
+ * Introduce .homesickrc
+  * Castles can now have a .homesickrc inside them
+  * On clone, this is eval'd inside the destination directory
+ * Introduce track command
+  * Allows easily moving an existing file into a castle, and symlinking it back
+
 # 0.5.0
 
  * Fixed listing of castles cloned using `homesick clone <github-user>/<github-repo>` (issue 3)

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,10 @@ 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 "rake", ">= 0.8.7"
-  gem "rspec", ">= 1.2.9"
+  gem "rspec", "~> 2.10"
-  gem "bundler", ">= 0.9.5"
+  gem "jeweler", ">= 1.6.2"
-  gem "jeweler", ">= 1.5.0.pre2"
+  gem "rcov", :platforms => :mri_18
-  gem "rcov", ">= 0"
+  gem "simplecov", :platforms => :mri_19
   gem "test-construct"
 end

Gemfile.lock

@@ -1,25 +1,42 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
+    diff-lcs (1.2.4)
     git (1.2.5)
-    jeweler (1.5.0.pre3)
+    jeweler (1.8.4)
-      bundler (~> 1.0.0)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    rake (0.8.7)
+      rdoc
-    rcov (0.9.8)
+    json (1.8.0)
-    rspec (1.3.0)
+    multi_json (1.7.3)
+    rake (10.0.4)
+    rcov (1.0.0)
+    rdoc (4.0.1)
+      json (~> 1.4)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
     test-construct (1.2.0)
-    thor (0.14.0)
+    thor (0.18.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (>= 0.9.5)
+  jeweler (>= 1.6.2)
-  jeweler (>= 1.5.0.pre2)
+  rake (>= 0.8.7)
-  rake
   rcov
-  rspec (>= 1.2.9)
+  rspec (~> 2.10)
+  simplecov
   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.
@@ -25,7 +27,7 @@ With the castle cloned, you can now link its contents into your home dir:
 
     homesick symlink pickled-vim
 
-If uou use the shorthand syntax for GitHub repositories in your clone, please note you will instead need to run:
+If you use the shorthand syntax for GitHub repositories in your clone, please note you will instead need to run:
 
     homesick symlink technicalpickles/pickled-vim
 
@@ -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 direcoties (instead of just first depth)" in this file.
+
+castle/home/.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/home/.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.
@@ -45,6 +137,10 @@ Not sure what else homesick has up its sleeve? There's always the built in help:
 * Commit, do not mess with rakefile, version, or history.  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
+## Need homesick without the ruby dependency?
+
+Check out [homeshick](https://github.com/andsens/homeshick).
+
 ## Copyright
 
 Copyright (c) 2010 Joshua Nichols. See LICENSE for details.

Rakefile

@@ -19,10 +19,11 @@ 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.authors = ["Joshua Nichols", "Yusuke Murata"]
-  gem.version = "0.6.0"
+  gem.version = "0.9.1"
+  gem.license = "MIT"
   # Have dependencies? Add them to Gemfile
 
   # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
@@ -30,21 +31,20 @@ end
 Jeweler::GemcutterTasks.new
 
 
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
-Spec::Rake::SpecTask.new(:spec) do |spec|
+RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
+  spec.pattern = FileList['spec/**/*_spec.rb']
-  spec.spec_files = FileList['spec/**/*_spec.rb']
 end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
+RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rcov = true
 end
 
+
 task :default => :spec
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

homesick.gemspec

@@ -1,24 +1,23 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{homesick}
-  s.version = "0.6.0"
+  s.version = "0.9.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Joshua Nichols"]
+  s.authors = [%q{Joshua Nichols}, %q{Yusuke Murata}]
-  s.date = %q{2010-10-27}
+  s.date = %q{2013-06-17}
-  s.default_executable = %q{homesick}
   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}
+  s.email = [%q{josh@technicalpickles.com}, %q{info@muratayusuke.com}]
-  s.executables = ["homesick"]
+  s.executables = [%q{homesick}]
   s.extra_rdoc_files = [
     "ChangeLog.markdown",
     "LICENSE",
@@ -26,7 +25,8 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
-    ".gitignore",
+    ".rspec",
+    ".travis.yml",
     "ChangeLog.markdown",
     "Gemfile",
     "Gemfile.lock",
@@ -43,42 +43,38 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/technicalpickles/homesick}
-  s.require_paths = ["lib"]
+  s.licenses = [%q{MIT}]
-  s.rubygems_version = %q{1.3.7}
+  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.}
-  s.test_files = [
-    "spec/homesick_spec.rb",
-    "spec/spec_helper.rb"
-  ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     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<rake>, [">= 0.8.7"])
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.10"])
-      s.add_development_dependency(%q<bundler>, [">= 0.9.5"])
+      s.add_development_dependency(%q<jeweler>, [">= 1.6.2"])
-      s.add_development_dependency(%q<jeweler>, [">= 1.5.0.pre2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
       s.add_development_dependency(%q<test-construct>, [">= 0"])
     else
       s.add_dependency(%q<thor>, [">= 0.14.0"])
-      s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<rake>, [">= 0.8.7"])
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<rspec>, ["~> 2.10"])
-      s.add_dependency(%q<bundler>, [">= 0.9.5"])
+      s.add_dependency(%q<jeweler>, [">= 1.6.2"])
-      s.add_dependency(%q<jeweler>, [">= 1.5.0.pre2"])
       s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
       s.add_dependency(%q<test-construct>, [">= 0"])
     end
   else
     s.add_dependency(%q<thor>, [">= 0.14.0"])
-    s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<rake>, [">= 0.8.7"])
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<rspec>, ["~> 2.10"])
-    s.add_dependency(%q<bundler>, [">= 0.9.5"])
+    s.add_dependency(%q<jeweler>, [">= 1.6.2"])
-    s.add_dependency(%q<jeweler>, [">= 1.5.0.pre2"])
     s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
     s.add_dependency(%q<test-construct>, [">= 0"])
   end
 end

lib/homesick.rb

@@ -10,6 +10,7 @@ class Homesick < Thor
   add_runtime_options!
 
   GITHUB_NAME_REPO_PATTERN = /\A([A-Za-z_-]+\/[A-Za-z_-]+)\Z/
+  SUBDIR_FILENAME = ".homesick_subdir"
 
   def initialize(args=[], options={}, config={})
     super
@@ -21,13 +22,18 @@ class Homesick < Thor
     inside repos_dir do
       destination = nil
       if File.exist?(uri)
-        destination = Pathname.new(uri).basename
+        uri = Pathname.new(uri).expand_path
+        if uri.to_s.start_with?(repos_dir.to_s)
+          raise "Castle already cloned to #{uri}"
+        end
+
+        destination = uri.basename
 
         ln_s uri, destination
       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 =~ /\/([^\/]*?)(\.git)?\Z/
         destination = Pathname.new($1)
         git_clone uri
       elsif uri =~ /[^:]+:([^:]+)(\.git)?\Z/
@@ -59,31 +65,46 @@ class Homesick < Thor
     end
   end
 
-  desc "pull NAME", "Update the specified castle"
+  desc "pull CASTLE", "Update the specified castle"
-  def pull(name)
+  method_option :all, :type => :boolean, :default => false, :required => false, :desc => "Update all cloned castles"
-    check_castle_existance(name, "pull")
+  def pull(name="")
-
+    if options[:all]
-    inside repos_dir.join(name) do
+      inside_each_castle do |castle|
-      git_pull
+        shell.say castle.to_s.gsub(repos_dir.to_s + '/', '') + ':'
-      git_submodule_init
+        update_castle castle
-      git_submodule_update
+      end
+    else
+      update_castle name
     end
+
   end
 
-  desc "symlink NAME", "Symlinks all dotfiles from the specified castle"
+  desc "commit CASTLE", "Commit the specified castle's changes"
+  def commit(name)
+    commit_castle name
+
+  end
+
+  desc "push CASTLE", "Push the specified castle"
+  def push(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)
     check_castle_existance(name, "symlink")
 
     inside castle_dir(name) do
-      files = Pathname.glob('.*').reject{|a| [".",".."].include?(a.to_s)}
+      subdirs = subdirs(name)
-      files.each do |path|
-        absolute_path = path.expand_path
 
-        inside home_dir do
+      # link files
-          adjusted_path = (home_dir + path).basename
+      symlink_each(name, castle_dir(name), subdirs)
 
-          ln_s absolute_path, adjusted_path
+      # link files in subdirs
-        end
+      subdirs.each do |subdir|
+        symlink_each(name, subdir, subdirs)
       end
     end
   end
@@ -91,28 +112,52 @@ class Homesick < Thor
   desc "track FILE CASTLE", "add a file to a castle"
   def track(file, castle)
     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
-    mv absolute_path, castle_path
+    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
+      absolute_path = castle_path + file.basename
-      home_path = home_dir + file
+      home_path = home_dir + relative_dir + file.basename
       ln_s absolute_path, home_path
     end
+
+    inside castle_path do
+      git_add absolute_path
+    end
+
+    # are we tracking something nested? Add the parent dir to the manifest
+    unless relative_dir.eql?(Pathname.new('.'))
+      subdir_add(castle, relative_dir)
+    end
   end
 
   desc "list", "List cloned castles"
   def list
-    #require 'ruby-debug'; breakpoint
+    inside_each_castle do |castle|
-    Pathname.glob("#{repos_dir}/**/*/.git") do |git_dir|
+      say_status castle.relative_path_from(repos_dir).to_s, `git config remote.origin.url`.chomp, :cyan
-      castle = git_dir.dirname
-      Dir.chdir castle do # so we can call git config from the right contxt
-        say_status castle.relative_path_from(repos_dir), `git config remote.origin.url`.chomp, :cyan
-      end
     end
   end
 
@@ -159,4 +204,138 @@ class Homesick < Thor
     end
   end
 
+  def all_castles
+    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) }
+    end
+  end
+
+  def inside_each_castle(&block)
+    all_castles.each do |git_dir|
+      castle = git_dir.dirname
+      Dir.chdir castle do # so we can call git config from the right contxt
+        yield castle
+      end
+    end
+  end
+
+  def update_castle(castle)
+    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.inject(false) { |memo, line| line.eql?("#{path.to_s}\n") || memo }
+    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
+      destination = config[:destination] || File.basename(repo, '.git')
-        repo =~ /([^\/]+)\.git$/
-       $1
-      end
 
       destination = Pathname.new(destination) unless destination.kind_of?(Pathname)
       FileUtils.mkdir_p destination.dirname
@@ -51,7 +48,7 @@ class Homesick
 
     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 = {})
@@ -59,6 +56,21 @@ class Homesick
       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 mv(source, destination, config = {})
       source = Pathname.new(source)
       destination = Pathname.new(destination + source.basename)
@@ -78,6 +90,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 +99,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,113 +1,304 @@
 require 'spec_helper' 
 
-describe Homesick do
+describe "homesick" do
-  before do
+  let(:home) { create_construct }
-    @homesick = Homesick.new
+  after { home.destroy! }
-  end
+
+  let(:castles) { home.directory(".homesick/repos") }
+
+  let(:homesick) { Homesick.new }
+
+  before { homesick.stub!(:repos_dir).and_return(castles) }
 
   describe "clone" do
-    it "should symlink existing directories" do
+    context "of a file" do
-      somewhere = create_construct
+      it "should symlink existing directories" do
-      somewhere.directory('wtf')
+        somewhere = create_construct
-      wtf = somewhere + 'wtf'
+        local_repo = somewhere.directory('wtf')
 
-      @homesick.should_receive(:ln_s).with(wtf.to_s, wtf.basename)
+        homesick.clone local_repo
 
-      @homesick.clone wtf.to_s
+        castles.join("wtf").readlink.should == local_repo
+      end
+
+      context "when it exists in a repo directory" do
+        before do
+          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
+          expect { homesick.clone @existing_dir.to_s }.to raise_error(/already cloned/i)
+        end
+      end
+    end
+
+    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 "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')
+      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 git@host:path/to.git" do
-      @homesick.should_receive(:git_clone).with('git@github.com:technicalpickles/pickled-vim.git')
+      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')
+      homesick.should_receive(:git_clone).with('http://github.com/technicalpickles/pickled-vim.git')
 
-      @homesick.clone 'http://github.com/technicalpickles/pickled-vim.git'
+      homesick.clone 'http://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')
+      homesick.should_receive(:git_clone).with('http://github.com/technicalpickles/pickled-vim')
 
-      @homesick.clone 'http://github.com/technicalpickles/pickled-vim'
+      homesick.clone 'http://github.com/technicalpickles/pickled-vim'
     end
 
     it "should clone git repo like host-alias:repos.git" do
-      @homesick.should_receive(:git_clone).with('gitolite:pickled-vim.git')
+      homesick.should_receive(:git_clone).with('gitolite:pickled-vim.git')
 
-      @homesick.clone 'gitolite:pickled-vim.git'
+      homesick.clone 'gitolite:pickled-vim.git'
     end
 
     it "should not try to clone a malformed uri like malformed" do
-      @homesick.should_not_receive(:git_clone)
+      homesick.should_not_receive(:git_clone)
 
-      @homesick.clone 'malformed' rescue nil
+      homesick.clone 'malformed' rescue nil
     end
 
     it "should throw an exception when trying to clone a malformed uri like malformed" do
-      lambda {
+      expect { homesick.clone 'malformed' }.to raise_error
-        @homesick.clone 'malformed'
-      }.should 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'))
+      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 "symlink" do
+    let(:castle) { given_castle("glencairn") }
+
+    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
+        somewhere_else = create_construct
+        existing_dotdir = home.directory(".vim")
+
+        dotdir = castle.directory(".vim")
+
+        homesick.symlink("glencairn")
+
+        existing_dotdir.readlink.should == dotdir
+      end
+    end
+
+    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.symlink("glencairn")
+
+        home_dotdir = home.join(".config")
+        home_dotdir.symlink?.should == false
+        home_dotdir.join(".some_dotfile").readlink.should == dotfile
+      end
+    end
+
+    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")
+
+        homesick.symlink("glencairn")
+
+        home_dotdir = home.join(".config").join("appA")
+        home_dotdir.symlink?.should == false
+        home_dotdir.join(".some_dotfile").readlink.should == dotfile
+      end
+    end
+
+    context "with '.config' and '.config/appA' in .homesick_subdir" do
+      let(:castle) { given_castle("glencairn", [".config", ".config/appA"]) }
+      it "can symlink under both of .config and .config/appA" do
+        config_dir = castle.directory(".config")
+        config_dotfile = config_dir.file(".some_dotfile")
+        appA_dir = config_dir.directory("appA")
+        appA_dotfile = appA_dir.file(".some_appfile")
+
+        homesick.symlink("glencairn")
+
+        home_config_dir = home.join(".config")
+        home_appA_dir = home_config_dir.join("appA")
+        home_config_dir.symlink?.should == false
+        home_config_dir.join(".some_dotfile").readlink.should == config_dotfile
+        home_appA_dir.symlink?.should == false
+        home_appA_dir.join(".some_appfile").readlink.should == appA_dotfile
+      end
     end
   end
 
   describe "list" do
+    it "should say each castle in the castle directory" do
+      given_castle('zomg')
+      given_castle('wtf/zomg')
 
-    # FIXME only passes in isolation. need to setup data a bit better
+      homesick.should_receive(:say_status).with("zomg", "git://github.com/technicalpickles/zomg.git", :cyan)
-    xit "should say each castle in the castle directory" do
+      homesick.should_receive(:say_status).with("wtf/zomg", "git://github.com/technicalpickles/zomg.git", :cyan)
-      @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"
-          end
-        end
 
-        repos_dir.directory 'wtf/zomg' do |zomg|
+      homesick.list
-          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)
-
-      @homesick.list
     end
   end
 
+  describe "pull" do
+
+    xit "needs testing"
+
+    describe "--all" do
+      xit "needs testing"
+    end
+
+  end
+
+  describe "commit" do
+
+    xit "needs testing"
+
+  end
+
+  describe "push" do
+
+    xit "needs testing"
+
+  end
+
   describe "track" do
     it "should move the tracked file into the castle" do
-      some_rc_file = @user_dir.file '.some_rc_file'
+      castle = given_castle('castle_repo')
-      homesickrepo = @user_dir.directory('.homesick').directory('repos').directory('castle_repo')
-      castle_path = homesickrepo.directory 'home'
 
-      # There is some hideous thing going on with construct; rming the file I'm moving works on this test.
+      some_rc_file = home.file '.some_rc_file'
-      # 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.
+      homesick.track(some_rc_file.to_s, 'castle_repo')
-      system "rm #{some_rc_file.to_s}"
+
-      Dir.chdir homesickrepo do
+      tracked_file = castle.join(".some_rc_file")
-        system "git init >/dev/null 2>&1"
+      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
+
+    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
 
-      @homesick.should_receive(:mv).with(some_rc_file, castle_path)
+      it 'should NOT add anything if the files parent is already listed' do
-      @homesick.should_receive(:ln_s).with(castle_path +  some_rc_file.basename, some_rc_file)
+        castle = given_castle('castle_repo')
-      @homesick.track(some_rc_file.to_s, '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

@@ -1,19 +1,35 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'homesick'
-require 'spec'
+require 'rspec'
-require 'spec/autorun'
+require 'rspec/autorun'
 require 'construct'
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.include Construct::Helpers
 
-  config.before do
+  config.before { ENV['HOME'] = home.to_s }
-    @user_dir = create_construct
+
-    ENV['HOME'] = @user_dir.to_s
+  config.before { silence! }
+
+  def silence!
+    homesick.stub(:say_status)
   end
 
-  config.after do
+  def given_castle(path, subdirs=[])
-    @user_dir.destroy!
+    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 then
+          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