homesick 0.5.4 → 0.6.0

data/Gemfile

@@ -9,7 +9,7 @@ group :development do
   gem "rake"
   gem "rspec", ">= 1.2.9"
   gem "bundler", ">= 0.9.5"
-  gem "jeweler", ">= 1.5.0.pre"
+  gem "jeweler", ">= 1.5.0.pre2"
   gem "rcov", ">= 0"
   gem "test-construct"
 end

data/Gemfile.lock

@@ -2,8 +2,8 @@ GEM
   remote: http://rubygems.org/
   specs:
     git (1.2.5)
-    jeweler (1.5.0.pre)
-      bundler (>= 1.0.0.rc.5)
+    jeweler (1.5.0.pre3)
+      bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
     rake (0.8.7)
@@ -17,7 +17,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (>= 0.9.5)
-  jeweler (>= 1.5.0.pre)
+  jeweler (>= 1.5.0.pre2)
   rake
   rcov
   rspec (>= 1.2.9)

data/Rakefile

@@ -22,7 +22,7 @@ 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.4"
+  gem.version = "0.6.0"
   # Have dependencies? Add them to Gemfile
 
   # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings

data/homesick.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{homesick}
-  s.version = "0.5.4"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joshua Nichols"]
-  s.date = %q{2010-09-03}
+  s.date = %q{2010-10-27}
   s.default_executable = %q{homesick}
   s.description = %q{
     A man's home (directory) is his castle, so don't leave home with out it.
@@ -44,7 +44,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/technicalpickles/homesick}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{A man's home is his castle. Never leave your dotfiles behind.}
   s.test_files = [
     "spec/homesick_spec.rb",
@@ -55,12 +55,12 @@ Gem::Specification.new do |s|
     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>, [">= 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<jeweler>, [">= 1.5.0.pre2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<test-construct>, [">= 0"])
     else
@@ -68,7 +68,7 @@ Gem::Specification.new do |s|
       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<jeweler>, [">= 1.5.0.pre2"])
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<test-construct>, [">= 0"])
     end
@@ -77,7 +77,7 @@ Gem::Specification.new do |s|
     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<jeweler>, [">= 1.5.0.pre2"])
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<test-construct>, [">= 0"])
   end

data/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,6 +88,23 @@ 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
@@ -94,7 +124,6 @@ class Homesick < Thor
     github_user = nil if github_user == ""
     github_repo = castle.basename
 
-
     empty_directory castle
     inside castle do
       git_init
@@ -107,6 +136,7 @@ class Homesick < Thor
     end
   end
 
+
   protected
 
   def home_dir

data/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)

data/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

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: homesick
 version: !ruby/object:Gem::Version 
+  hash: 7
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 4
-  version: 0.5.4
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Joshua Nichols
@@ -14,15 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-03 00:00:00 -04:00
+date: 2010-10-27 00:00:00 -04:00
 default_executable: homesick
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
+  prerelease: false
   version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 39
         segments: 
         - 0
         - 14
@@ -30,25 +34,29 @@ dependencies:
         version: 0.14.0
   name: thor
   requirement: *id001
-  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
+  prerelease: false
   version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   name: rake
   requirement: *id002
-  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
+  prerelease: false
   version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 2
@@ -56,13 +64,15 @@ dependencies:
         version: 1.2.9
   name: rspec
   requirement: *id003
-  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
+  prerelease: false
   version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 49
         segments: 
         - 0
         - 9
@@ -70,46 +80,51 @@ dependencies:
         version: 0.9.5
   name: bundler
   requirement: *id004
-  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
+  prerelease: false
   version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: -1876988199
         segments: 
         - 1
         - 5
         - 0
-        - pre
-        version: 1.5.0.pre
+        - pre2
+        version: 1.5.0.pre2
   name: jeweler
   requirement: *id005
-  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
+  prerelease: false
   version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   name: rcov
   requirement: *id006
-  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
+  prerelease: false
   version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   name: test-construct
   requirement: *id007
-  prerelease: false
 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  "
 email: josh@technicalpickles.com
 executables: 
@@ -147,23 +162,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A man's home is his castle. Never leave your dotfiles behind.