Regenerate gemspec for version 0.6.1

* Moves a specified file into the specified castle.
* Symlinks it into its original position.

Signed-off-by: Joshua Nichols <josh@technicalpickles.com>

.rspec

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

Gemfile

@@ -7,9 +7,9 @@ gem "thor", ">= 0.14.0"
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "rake"
-  gem "rspec", ">= 1.2.9"
-  gem "bundler", ">= 0.9.5"
-  gem "jeweler", ">= 1.5.0.pre"
+  gem "rspec", "~> 2.1.0"
+  gem "bundler", "~> 1.0.0"
+  gem "jeweler", ">= 1.5.0.pre6"
   gem "rcov", ">= 0"
   gem "test-construct"
 end

Gemfile.lock

@@ -1,14 +1,22 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    diff-lcs (1.1.2)
     git (1.2.5)
-    jeweler (1.5.0.pre)
-      bundler (>= 1.0.0.rc.5)
+    jeweler (1.5.0.pre6)
+      bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
     rake (0.8.7)
     rcov (0.9.8)
-    rspec (1.3.0)
+    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)
     test-construct (1.2.0)
     thor (0.14.0)
 
@@ -16,10 +24,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (>= 0.9.5)
-  jeweler (>= 1.5.0.pre)
+  bundler (~> 1.0.0)
+  jeweler (>= 1.5.0.pre6)
   rake
   rcov
-  rspec (>= 1.2.9)
+  rspec (~> 2.1.0)
   test-construct
   thor (>= 0.14.0)

Rakefile

@@ -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.3"
+  gem.version = "0.6.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,18 +31,17 @@ end
 Jeweler::GemcutterTasks.new
 
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
+RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rcov = true
 end
 
+
 task :default => :spec
 
 require 'rake/rdoctask'

homesick.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{homesick}
-  s.version = "0.5.3"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joshua Nichols"]
-  s.date = %q{2010-08-19}
+  s.date = %q{2010-11-13}
   s.default_executable = %q{homesick}
   s.description = %q{
     A man's home (directory) is his castle, so don't leave home with out it.
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
-    ".gitignore",
+    ".rspec",
     "ChangeLog.markdown",
     "Gemfile",
     "Gemfile.lock",
@@ -43,6 +43,7 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/technicalpickles/homesick}
+  s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{A man's home is his castle. Never leave your dotfiles behind.}
@@ -58,26 +59,26 @@ Gem::Specification.new do |s|
     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>, [">= 1.2.9"])
-      s.add_development_dependency(%q<bundler>, [">= 0.9.5"])
-      s.add_development_dependency(%q<jeweler>, [">= 1.5.0.pre"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.1.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, [">= 1.5.0.pre6"])
       s.add_development_dependency(%q<rcov>, [">= 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<rspec>, [">= 1.2.9"])
-      s.add_dependency(%q<bundler>, [">= 0.9.5"])
-      s.add_dependency(%q<jeweler>, [">= 1.5.0.pre"])
+      s.add_dependency(%q<rspec>, ["~> 2.1.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, [">= 1.5.0.pre6"])
       s.add_dependency(%q<rcov>, [">= 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<rspec>, [">= 1.2.9"])
-    s.add_dependency(%q<bundler>, [">= 0.9.5"])
-    s.add_dependency(%q<jeweler>, [">= 1.5.0.pre"])
+    s.add_dependency(%q<rspec>, ["~> 2.1.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, [">= 1.5.0.pre6"])
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<test-construct>, [">= 0"])
   end

lib/homesick.rb

@@ -43,6 +43,19 @@ 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
 
@@ -75,9 +88,25 @@ 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
     Pathname.glob("#{repos_dir}/**/*/.git") do |git_dir|
       castle = git_dir.dirname
       Dir.chdir castle do # so we can call git config from the right contxt
@@ -94,7 +123,6 @@ class Homesick < Thor
     github_user = nil if github_user == ""
     github_repo = castle.basename
 
-
     empty_directory castle
     inside castle do
       git_init
@@ -107,6 +135,7 @@ class Homesick < Thor
     end
   end
 
+
   protected
 
   def home_dir

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,4 +1,4 @@
-require 'spec_helper'
+require 'spec_helper' 
 
 describe Homesick do
   before do
@@ -83,13 +83,31 @@ 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 "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 'spec/autorun'
+require 'rspec'
+require 'rspec/autorun'
 require 'construct'
 
-Spec::Runner.configure do |config|
+Rspec.configure do |config|
   config.include Construct::Helpers
 
   config.before do