Regenerate gemspec for version 0.7.0

Further abstracted locating castles into Homesick.all_castles which globs as
before, but after that rejects any paths that lie in other paths. This way
castles that have submodules don't cause extra output in e.g. list.

.rspec

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

ChangeLog.markdown

@@ -1,3 +1,20 @@
+# 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,16 +1,15 @@
+source :gemcutter
+
 # Add dependencies required to use your gem here.
-group :runtime do
+gem "thor", ">= 0.14.0"
-  #gem 'bundler', '>= 0.9.5'
-  gem "thor", ">= 0.13.6"
-end
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "rake"
-  gem "rspec", ">= 1.2.9"
+  gem "rspec", "~> 2.1.0"
-  gem "bundler", ">= 0.9.5"
+  gem "jeweler", ">= 1.6.2"
-  gem "jeweler", ">= 1.4.0"
   gem "rcov", ">= 0"
   gem "test-construct"
+  gem "ruby-debug"
 end

Gemfile.lock

@@ -0,0 +1,40 @@
+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

@@ -25,7 +25,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
 
@@ -45,6 +45,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

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'bundler'
 begin
-  Bundler.setup(:runtime, :development)
+  Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
   $stderr.puts e.message
   $stderr.puts "Run `bundle install` to install missing gems"
@@ -14,7 +14,7 @@ Jeweler::Tasks.new do |gem|
   gem.name = "homesick"
   gem.summary = %Q{A man's home is his castle. Never leave your dotfiles behind.}
   gem.description = %Q{
-    A man’s home (directory) is his castle, so don’t leave home with out it.
+    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. 
 
@@ -22,7 +22,8 @@ Jeweler::Tasks.new do |gem|
   gem.email = "josh@technicalpickles.com"
   gem.homepage = "http://github.com/technicalpickles/homesick"
   gem.authors = ["Joshua Nichols"]
-  gem.version = "0.5.2"
+  gem.version = "0.7.0"
+  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,18 +31,17 @@ 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'

homesick.gemspec

@@ -1,64 +1,75 @@
 # 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.name = "homesick"
-  s.version = "0.5.2"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joshua Nichols"]
-  s.date = %q{2010-07-22}
+  s.date = "2012-05-28"
-  s.default_executable = %q{homesick}
+  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.description = %q{
+  s.email = "josh@technicalpickles.com"
-    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.executables = ["homesick"]
   s.extra_rdoc_files = [
     "ChangeLog.markdown",
-     "LICENSE",
+    "LICENSE",
-     "README.markdown"
+    "README.markdown"
   ]
   s.files = [
     ".document",
-     ".gitignore",
+    ".rspec",
-     "ChangeLog.markdown",
+    "ChangeLog.markdown",
-     "Gemfile",
+    "Gemfile",
-     "LICENSE",
+    "Gemfile.lock",
-     "README.markdown",
+    "LICENSE",
-     "Rakefile",
+    "README.markdown",
-     "bin/homesick",
+    "Rakefile",
-     "homesick.gemspec",
+    "bin/homesick",
-     "lib/homesick.rb",
+    "homesick.gemspec",
-     "lib/homesick/actions.rb",
+    "lib/homesick.rb",
-     "lib/homesick/shell.rb",
+    "lib/homesick/actions.rb",
-     "spec/homesick_spec.rb",
+    "lib/homesick/shell.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/technicalpickles/homesick}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  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"
+    "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."
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    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<jeweler>, [">= 1.6.2"])
+      s.add_development_dependency(%q<rcov>, [">= 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<jeweler>, [">= 1.6.2"])
+      s.add_dependency(%q<rcov>, [">= 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<jeweler>, [">= 1.6.2"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<test-construct>, [">= 0"])
+    s.add_dependency(%q<ruby-debug>, [">= 0"])
   end
 end
 

lib/homesick.rb

@@ -21,18 +21,25 @@ 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)
+          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
-      else
+      elsif uri =~ /\/([^\/]*)(\.git)?\Z/
-        if uri =~ /\/([^\/]*).git\Z/
+        destination = Pathname.new($1)
-          destination = Pathname.new($1)
-        end
-
         git_clone uri
+      elsif uri =~ /[^:]+:([^:]+)(\.git)?\Z/
+        destination = Pathname.new($1)
+        git_clone uri
+      else
+        raise "Unknown URI format: #{uri}"
       end
 
       if destination.join('.gitmodules').exist?
@@ -41,18 +48,34 @@ class Homesick < Thor
           git_submodule_update
         end
       end
+
+      homesickrc = destination.join('.homesickrc').expand_path
+      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
+          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
+        end
+      end
     end
   end
 
   desc "pull NAME", "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"
@@ -73,14 +96,27 @@ class Homesick < Thor
     end
   end
 
+  desc "track FILE CASTLE", "add a file to a castle"
+  def track(file, castle)
+    castle = Pathname.new(castle)
+    file = Pathname.new(file)
+    check_castle_existance(castle, 'track')
+    
+    absolute_path = file.expand_path
+    castle_path = castle_dir(castle)
+    mv absolute_path, castle_path
+
+    inside home_dir do
+      absolute_path = castle_dir(castle) + file.basename
+      home_path = home_dir + file
+      ln_s absolute_path, home_path
+    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), `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
 
@@ -92,7 +128,6 @@ class Homesick < Thor
     github_user = nil if github_user == ""
     github_repo = castle.basename
 
-
     empty_directory castle
     inside castle do
       git_init
@@ -105,6 +140,7 @@ class Homesick < Thor
     end
   end
 
+
   protected
 
   def home_dir
@@ -127,4 +163,29 @@ class Homesick < Thor
     end
   end
 
+  def all_castles
+    dirs = Pathname.glob("#{repos_dir}/**/*/.git")
+    # 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
 end

lib/homesick/actions.rb

@@ -59,6 +59,22 @@ class Homesick
       system "git pull --quiet" unless options[:pretend]
     end
 
+    def mv(source, destination, config = {})
+      source = Pathname.new(source)
+      destination = Pathname.new(destination + source.basename)
+
+      if destination.exist?
+        say_status :conflict, "#{destination} exists", :red unless options[:quiet]
+
+        if options[:force] || shell.file_collision(destination) { source }
+          system "mv #{source} #{destination}" unless options[:pretend]
+        end
+      else
+        # this needs some sort of message here.
+        system "mv #{source} #{destination}" unless options[:pretend]
+      end
+    end
+
     def ln_s(source, destination, config = {})
       source = Pathname.new(source)
       destination = Pathname.new(destination)
@@ -69,14 +85,14 @@ class Homesick
         else
           say_status :conflict, "#{destination} exists and points to #{destination.readlink}", :red unless options[:quiet]
 
-          if shell.file_collision(destination) { source }
+          if options[:force] || shell.file_collision(destination) { source }
             system "ln -sf #{source} #{destination}" unless options[:pretend]
           end
         end
       elsif destination.exist?
         say_status :conflict, "#{destination} exists", :red unless options[:quiet]
 
-        if shell.file_collision(destination) { source }
+        if options[:force] || shell.file_collision(destination) { source }
           system "ln -sf #{source} #{destination}" unless options[:pretend]
         end
       else

spec/homesick_spec.rb

@@ -1,19 +1,42 @@
-require 'spec_helper'
+require 'spec_helper' 
 
-describe Homesick do
+describe "homesick" do
   before do
     @homesick = Homesick.new
   end
 
   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'
+        somewhere.directory('wtf')
+        wtf = somewhere + 'wtf'
 
-      @homesick.should_receive(:ln_s).with(wtf.to_s, wtf.basename)
+        @homesick.should_receive(:ln_s).with(wtf, wtf.basename)
 
-      @homesick.clone wtf.to_s
+        @homesick.clone wtf
+      end
+
+      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)
+        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)
+        end
+      end
     end
 
     it "should clone git repo like git://host/path/to.git" do
@@ -34,6 +57,30 @@ describe Homesick do
       @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.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.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.clone 'malformed' rescue nil
+    end
+
+    it "should throw an exception when trying to clone a malformed uri like malformed" do
+      lambda {
+        @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'))
 
@@ -59,13 +106,41 @@ describe Homesick do
             system "git remote add origin git://github.com/technicalpickles/zomg.git >/dev/null 2>&1"
           end
         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 "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'
+       
+      # 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')
+    end
+  end
 end

spec/spec_helper.rb

@@ -1,11 +1,11 @@
 $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