7 Commits

Author SHA1 Message Date
Joshua Nichols
d0097eb5b6 Regenerated gemspec for version 0.6.0 2010-10-27 10:42:16 -04:00
Joshua Nichols
71303376ee Version bump to 0.6.0 2010-10-27 10:41:57 -04:00
Joshua Nichols
8dbd5a9b21 Spiked homesickrc support. Create a .homesickrc in a castle, and you will be prompted to eval it at clone. Runs in castle directory, and runs in the context of a Homesick instance 2010-10-27 10:09:24 -04:00
Joshua Nichols
f82dc905a2 Tweaks to track. Don't add & commit newly tracked file. Also fix tests to not be spitting out to stdout. 2010-10-27 08:38:30 -04:00
Joshua Nichols
bfbabc05d5 Removing copy-pasta 2010-10-27 08:38:30 -04:00
j.c.sackett
58767454b3 Added track command.
* Moves a specified file into the specified castle.
* Symlinks it into its original position.

Signed-off-by: Joshua Nichols <josh@technicalpickles.com>
2010-10-27 08:37:56 -04:00
Jon Sackett
4776651b27 Updated dependencies to use a version of jeweler that's available in rubygems. 2010-09-30 19:59:45 -04:00
7 changed files with 80 additions and 16 deletions

View File

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

View File

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

View File

@@ -22,7 +22,7 @@ Jeweler::Tasks.new do |gem|
gem.email = "josh@technicalpickles.com" gem.email = "josh@technicalpickles.com"
gem.homepage = "http://github.com/technicalpickles/homesick" gem.homepage = "http://github.com/technicalpickles/homesick"
gem.authors = ["Joshua Nichols"] gem.authors = ["Joshua Nichols"]
gem.version = "0.5.4" gem.version = "0.6.0"
# Have dependencies? Add them to Gemfile # Have dependencies? Add them to Gemfile
# gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings

View File

@@ -5,11 +5,11 @@
Gem::Specification.new do |s| Gem::Specification.new do |s|
s.name = %q{homesick} 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.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Joshua Nichols"] s.authors = ["Joshua Nichols"]
s.date = %q{2010-09-03} s.date = %q{2010-10-27}
s.default_executable = %q{homesick} s.default_executable = %q{homesick}
s.description = %q{ s.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.
@@ -44,7 +44,7 @@ Gem::Specification.new do |s|
] ]
s.homepage = %q{http://github.com/technicalpickles/homesick} s.homepage = %q{http://github.com/technicalpickles/homesick}
s.require_paths = ["lib"] 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.summary = %q{A man's home is his castle. Never leave your dotfiles behind.}
s.test_files = [ s.test_files = [
"spec/homesick_spec.rb", "spec/homesick_spec.rb",
@@ -55,12 +55,12 @@ Gem::Specification.new do |s|
current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
s.specification_version = 3 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_runtime_dependency(%q<thor>, [">= 0.14.0"])
s.add_development_dependency(%q<rake>, [">= 0"]) s.add_development_dependency(%q<rake>, [">= 0"])
s.add_development_dependency(%q<rspec>, [">= 1.2.9"]) s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
s.add_development_dependency(%q<bundler>, [">= 0.9.5"]) 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<rcov>, [">= 0"])
s.add_development_dependency(%q<test-construct>, [">= 0"]) s.add_development_dependency(%q<test-construct>, [">= 0"])
else else
@@ -68,7 +68,7 @@ Gem::Specification.new do |s|
s.add_dependency(%q<rake>, [">= 0"]) s.add_dependency(%q<rake>, [">= 0"])
s.add_dependency(%q<rspec>, [">= 1.2.9"]) s.add_dependency(%q<rspec>, [">= 1.2.9"])
s.add_dependency(%q<bundler>, [">= 0.9.5"]) 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<rcov>, [">= 0"])
s.add_dependency(%q<test-construct>, [">= 0"]) s.add_dependency(%q<test-construct>, [">= 0"])
end end
@@ -77,7 +77,7 @@ Gem::Specification.new do |s|
s.add_dependency(%q<rake>, [">= 0"]) s.add_dependency(%q<rake>, [">= 0"])
s.add_dependency(%q<rspec>, [">= 1.2.9"]) s.add_dependency(%q<rspec>, [">= 1.2.9"])
s.add_dependency(%q<bundler>, [">= 0.9.5"]) 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<rcov>, [">= 0"])
s.add_dependency(%q<test-construct>, [">= 0"]) s.add_dependency(%q<test-construct>, [">= 0"])
end end

View File

@@ -43,6 +43,19 @@ class Homesick < Thor
git_submodule_update git_submodule_update
end end
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
end end
@@ -75,6 +88,23 @@ class Homesick < Thor
end end
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" desc "list", "List cloned castles"
def list def list
#require 'ruby-debug'; breakpoint #require 'ruby-debug'; breakpoint
@@ -94,7 +124,6 @@ class Homesick < Thor
github_user = nil if github_user == "" github_user = nil if github_user == ""
github_repo = castle.basename github_repo = castle.basename
empty_directory castle empty_directory castle
inside castle do inside castle do
git_init git_init
@@ -107,6 +136,7 @@ class Homesick < Thor
end end
end end
protected protected
def home_dir def home_dir

View File

@@ -59,6 +59,22 @@ class Homesick
system "git pull --quiet" unless options[:pretend] system "git pull --quiet" unless options[:pretend]
end 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 = {}) def ln_s(source, destination, config = {})
source = Pathname.new(source) source = Pathname.new(source)
destination = Pathname.new(destination) destination = Pathname.new(destination)

View File

@@ -84,12 +84,30 @@ describe Homesick do
end end
end end
end end
@homesick.should_receive(:say_status).with("zomg", "git://github.com/technicalpickles/zomg.git", :cyan) @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.should_receive(:say_status).with("wtf/zomg", "git://github.com/technicalpickles/zomg.git", :cyan)
@homesick.list @homesick.list
end 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
end end