homesick 0.4.1 → 0.5.1

data/ChangeLog.markdown

@@ -1,3 +1,9 @@
+# 0.5.0
+
+ * Fixed listing of castles cloned using `homesick clone <github-user>/<github-repo>` (issue 3)
+ * Added `homesick pull <CASTLE>` for updating castles (thanks Jorge Dias!)
+ * Added a very basic `homesick generate <CASTLE>`
+
 # 0.4.1
 
  * Improved error message when a castle's home dir doesn't exist

data/README.markdown

@@ -2,7 +2,7 @@
 
 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.
+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.
 
 We call a repository that is compatible with homesick to be a 'castle'. To act as a castle, a repository must be organized like so:
 
@@ -25,6 +25,10 @@ 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:
+
+    homesick symlink technicalpickles/pickled-vim
+
 If you're not sure what castles you have around, you can easily list them:
 
     homesick list

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.4.1"
+  gem.version = "0.5.1"
   # 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.4.1"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joshua Nichols"]
-  s.date = %q{2010-04-02}
+  s.date = %q{2010-05-18}
   s.default_executable = %q{homesick}
   s.description = %q{
     A man’s home (directory) is his castle, so don’t leave home with out it.

data/lib/homesick.rb

@@ -44,13 +44,20 @@ class Homesick < Thor
     end
   end
 
+  desc "pull NAME", "Update the specified castle"
+  def pull(name)
+    check_castle_existance(name, "pull")
+
+    inside repos_dir.join(name) do
+      git_pull
+      git_submodule_init
+      git_submodule_update
+    end
+  end
+
   desc "symlink NAME", "Symlinks all dotfiles from the specified castle"
   def symlink(name)
-    unless castle_dir(name).exist?
-      say_status :error, "Could not symlink #{name}, expected #{castle_dir(name)} exist and contain dotfiles", :red
-
-      exit(1)
-    end
+    check_castle_existance(name, "symlink")
 
     inside castle_dir(name) do
       files = Pathname.glob('.*').reject{|a| [".",".."].include?(a.to_s)}
@@ -68,10 +75,33 @@ class Homesick < Thor
 
   desc "list", "List cloned castles"
   def list
-    Pathname.glob(repos_dir + "*") do |castle|
+    #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
-        say_status castle.basename.to_s, `git config remote.origin.url`.chomp, :cyan
+        say_status castle.relative_path_from(repos_dir), `git config remote.origin.url`.chomp, :cyan
+      end
+    end
+  end
+
+  desc "generate PATH", "generate a homesick-ready git repo at PATH"
+  def generate(castle)
+    castle = Pathname.new(castle).expand_path
+
+    github_user = `git config github.user`.chomp
+    github_user = nil if github_user == ""
+    github_repo = castle.basename
+
+
+    empty_directory castle
+    inside castle do
+      git_init
+      if github_user
+        url = "git@github.com:#{github_user}/#{github_repo}.git"
+        git_remote_add 'origin', url
       end
+
+      empty_directory "home"
     end
   end
 
@@ -85,9 +115,16 @@ class Homesick < Thor
     @repos_dir ||= home_dir.join('.homesick', 'repos').expand_path
   end
 
-
   def castle_dir(name)
     repos_dir.join(name, 'home')
   end
 
+  def check_castle_existance(name, action)
+    unless castle_dir(name).exist?
+      say_status :error, "Could not #{action} #{name}, expected #{castle_dir(name)} exist and contain dotfiles", :red
+
+      exit(1)
+    end
+  end
+
 end

data/lib/homesick/actions.rb

@@ -19,6 +19,31 @@ class Homesick
       end
     end
 
+    def git_init(path = ".")
+      path = Pathname.new(path)
+
+      inside path do
+        unless path.join('.git').exist?
+          say_status 'git init', '' unless options[:quiet]
+          system "git init >/dev/null" unless options[:pretend]
+        else
+          say_status 'git init', 'already initialized', :blue unless options[:quiet]
+        end
+      end
+    end
+
+    def git_remote_add(name, url)
+      existing_remote = `git config remote.#{name}.url`.chomp
+      existing_remote = nil if existing_remote == ''
+
+      unless existing_remote
+        say_status 'git remote', "add #{name} #{url}" unless options[:quiet]
+        system "git remote add #{name} #{url}" unless options[:pretend]
+      else
+        say_status 'git remote', "#{name} already exists", :blue unless options[:quiet]
+      end
+    end
+
     def git_submodule_init(config = {})
       say_status 'git submodule', 'init', :green unless options[:quiet]
       system "git submodule --quiet init" unless options[:pretend]
@@ -29,6 +54,11 @@ class Homesick
       system "git submodule --quiet update >/dev/null 2>&1" unless options[:pretend]
     end
 
+    def git_pull(config = {})
+      say_status 'git pull', '', :green unless options[:quiet]
+      system "git pull --quiet" unless options[:pretend]
+    end
+
     def ln_s(source, destination, config = {})
       source = Pathname.new(source)
       destination = Pathname.new(destination)

data/spec/homesick_spec.rb

@@ -11,10 +11,11 @@ describe Homesick do
       somewhere.directory('wtf')
       wtf = somewhere + 'wtf'
 
-      @homesick.should_receive(:ln_s).with(wtf.to_s, wtf.basename.to_s)
+      @homesick.should_receive(:ln_s).with(wtf.to_s, wtf.basename)
 
       @homesick.clone wtf.to_s
     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')
 
@@ -34,7 +35,7 @@ describe Homesick do
     end
 
     it "should clone a github repo" do
-      @homesick.should_receive(:git_clone).with('git://github.com/wfarr/dotfiles.git', :destination => 'wfarr/dotfiles')
+      @homesick.should_receive(:git_clone).with('git://github.com/wfarr/dotfiles.git', :destination => Pathname.new('wfarr/dotfiles'))
 
       @homesick.clone "wfarr/dotfiles"
     end
@@ -51,9 +52,17 @@ describe Homesick do
             system "git remote add origin git://github.com/technicalpickles/zomg.git >/dev/null 2>&1"
           end
         end
+
+        repos_dir.directory 'wtf/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
       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

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 4
+  - 5
   - 1
-  version: 0.4.1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Joshua Nichols
@@ -14,37 +14,36 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-02 00:00:00 -04:00
+date: 2010-05-18 00:00:00 -04:00
 default_executable: homesick
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: thor
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
+  name: thor
+  requirement: *id001
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         version: "0"
-  type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rake
+  requirement: *id002
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -53,12 +52,12 @@ dependencies:
         - 2
         - 9
         version: 1.2.9
-  type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: bundler
+  name: rspec
+  requirement: *id003
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -67,12 +66,12 @@ dependencies:
         - 9
         - 5
         version: 0.9.5
-  type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: bundler
+  requirement: *id004
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -81,32 +80,33 @@ dependencies:
         - 4
         - 0
         version: 1.4.0
-  type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rcov
+  name: jeweler
+  requirement: *id005
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         version: "0"
-  type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: test-construct
+  name: rcov
+  requirement: *id006
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         version: "0"
-  type: :development
-  version_requirements: *id007
+  name: test-construct
+  requirement: *id007
+  prerelease: false
 description: "\n    A man\xE2\x80\x99s home (directory) is his castle, so don\xE2\x80\x99t 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: