Regenerated gemspec for version 0.3.0

There's a bunch of different way to specify git uri's. Instead of trying
to recognize uri's let's just accept that the user knows, what he's doing.

ChangeLog.markdown

@@ -1,9 +1,22 @@
+# 3.0.0
+
+ * Renamed 'link' to 'symlink'
+ * Fixed conflict resolution when symlink destination exists and is a normal file
+
+# 2.0.0
+
+ * Better support for recognizing git urls (thanks jacobat!)
+	 * if it looks like a github user/repo, do that
+	 * otherwise hand off to git clone
+ * Listing now displays in color, and show git remote
+ * Support pretend, force, and quiet modes
+
 # 0.1.1
 
  * Fixed trying to link against castles that don't exist
  * Fixed linking, which tries to exclude . and .. from the list of files to
- link (thanks Martinos)
+ link (thanks Martinos!)
 
- # 0.1.0
+# 0.1.0
 
  * Initial release

README.markdown

@@ -1,14 +1,13 @@
-= homesick
+# homesick
 
 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, 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:
 
 * Contains a 'home' directory
 * 'home' contains any number of files and directories that begin with '.'
-* Optionally has a README file
 
 To get started, install homesick first:
 
@@ -24,13 +23,17 @@ Alternatively, if it's on github, there's a slightly shorter way:
 
 With the castle cloned, you can now link its contents into your home dir:
 
-    homesick link pickled-vim
+    homesick symlink pickled-vim
 
 If you're not sure what castles you have around, you can easily list them:
 
     homesick list
 
-== Note on Patches/Pull Requests
+Not sure what else homesick has up its sleeve? There's always the built in help:
+
+    homesick help
+
+## Note on Patches/Pull Requests
  
 * Fork the project.
 * Make your feature addition or bug fix.
@@ -38,6 +41,6 @@ If you're not sure what castles you have around, you can easily list them:
 * 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.
 
-== Copyright
+## Copyright
 
 Copyright (c) 2010 Joshua Nichols. See LICENSE for details.

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

bin/homesick

@@ -2,7 +2,7 @@
 
 require 'pathname'
 lib = Pathname.new(__FILE__).dirname.join('..', 'lib').expand_path
-$LOAD_PATH.unshift.unshift lib.to_s unless $LOAD_PATH.include?(lib.to_s)
+$LOAD_PATH.unshift lib.to_s 
 
 require 'homesick'
 

homesick.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{homesick}
-  s.version = "0.1.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joshua Nichols"]
-  s.date = %q{2010-03-17}
+  s.date = %q{2010-04-01}
   s.default_executable = %q{homesick}
   s.description = %q{
     A man’s home (directory) is his castle, so don’t leave home with out it.
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = [
     "ChangeLog.markdown",
      "LICENSE",
-     "README.rdoc"
+     "README.markdown"
   ]
   s.files = [
     ".document",
@@ -30,11 +30,13 @@ Gem::Specification.new do |s|
      "ChangeLog.markdown",
      "Gemfile",
      "LICENSE",
-     "README.rdoc",
+     "README.markdown",
      "Rakefile",
      "bin/homesick",
      "homesick.gemspec",
      "lib/homesick.rb",
+     "lib/homesick/actions.rb",
+     "lib/homesick/shell.rb",
      "spec/homesick/homesick_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb"

lib/homesick.rb

@@ -1,46 +1,35 @@
 require 'thor'
 
 class Homesick < Thor
+  autoload :Shell, 'homesick/shell'
+  autoload :Actions, 'homesick/actions'
+
   include Thor::Actions
+  include Homesick::Actions
 
-  # Hack in support for diffing symlinks
+  add_runtime_options!
-  class Shell < Thor::Shell::Color
 
-    def show_diff(destination, content)
+  GITHUB_NAME_REPO_PATTERN = /\A([A-Za-z_-]+)\/([A-Za-z_-]+)\Z/
-      destination = Pathname.new(destination)
-
-      if destination.symlink?
-        say "- #{destination.readlink}", :red, true
-        say "+ #{content.expand_path}", :green, true
-      else
-        super
-      end
-    end
-
-  end
 
   def initialize(args=[], options={}, config={})
     super
     self.shell = Homesick::Shell.new
   end
 
-  GIT_URI_PATTERN = /^git:\/\//
-  GITHUB_NAME_REPO_PATTERN = /([A-Za-z_-]+)\/([A-Za-z_-]+)/
-
   desc "clone URI", "Clone +uri+ as a castle for homesick"
   def clone(uri)
     empty_directory repos_dir, :verbose => false
     inside repos_dir do
-      if uri =~ GIT_URI_PATTERN
+      if uri =~ GITHUB_NAME_REPO_PATTERN
+        git_clone "git://github.com/#{$1}/#{$2}.git", :destination => "#{$1}_#{$2}"
+      else
         git_clone uri
-      elsif uri =~ GITHUB_NAME_REPO_PATTERN
-        git_clone "git://github.com/#{$1}/#{$2}.git", "#{$1}_#{$2}"
       end
     end
   end
 
-  desc "link NAME", "Symlinks all dotfiles from the specified castle"
+  desc "symlink NAME", "Symlinks all dotfiles from the specified castle"
-  def link(home)
+  def symlink(home)
     unless castle_dir(home).exist?
       say_status :error, "Castle #{home} did not exist in #{repos_dir}", :red
 
@@ -55,7 +44,7 @@ class Homesick < Thor
           inside user_dir do
             adjusted_path = (user_dir + path).basename
 
-            symlink absolute_path, adjusted_path
+            ln_s absolute_path, adjusted_path
           end
         end
       end
@@ -67,7 +56,9 @@ class Homesick < Thor
   def list
     inside repos_dir do
       Pathname.glob('*') do |home|
-        puts home
+        inside home do
+          say_status home, `git config remote.origin.url`, :cyan
+        end
       end
     end
   end
@@ -90,43 +81,6 @@ class Homesick < Thor
 
   protected
 
-  # TODO move this to be more like thor's template, empty_directory, etc
-  def git_clone(repo, config = {})
-    config ||= {}
-    destination = config[:destination] || begin
-                                            repo =~ /([^\/]+)\.git$/
-                                            $1
-                                          end
-
-    destination = Pathname.new(destination) unless destination.kind_of?(Pathname)
-
-    if ! destination.directory?
-      say_status 'git clone', "#{repo} to #{destination.expand_path}", :green if config.fetch(:verbose, true)
-      system "git clone #{repo} #{destination}" unless options[:pretend]
-    else
-      say_status :exist, destination.expand_path, :blue
-    end
-  end
-
-  def symlink(source, destination, config = {})
-    destination = Pathname.new(destination)
-
-    if destination.symlink?
-      if destination.readlink == source
-        say_status :identical, destination.expand_path, :blue
-      else
-        say_status :conflict, "#{destination} exists and points to #{destination.readlink}", :red
-
-        if shell.file_collision(destination) { source }
-          system "ln -sf #{source} #{destination}"
-        end
-      end
-    else
-      say_status :symlink, "#{source.expand_path} to #{destination.expand_path}", :green
-      system "ln -s #{source} #{destination}"
-    end
-  end
-
   def user_dir
     self.class.user_dir
   end

lib/homesick/actions.rb

@@ -0,0 +1,46 @@
+class Homesick
+  module Actions
+    # TODO move this to be more like thor's template, empty_directory, etc
+    def git_clone(repo, config = {})
+      config ||= {}
+      destination = config[:destination] || begin
+        repo =~ /([^\/]+)\.git$/
+          $1
+      end
+
+      destination = Pathname.new(destination) unless destination.kind_of?(Pathname)
+
+      if ! destination.directory?
+        say_status 'git clone', "#{repo} to #{destination.expand_path}", :green unless options[:quiet]
+        system "git clone -q #{repo} #{destination}" unless options[:pretend]
+      else
+        say_status :exist, destination.expand_path, :blue unless options[:quiet]
+      end
+    end
+
+    def ln_s(source, destination, config = {})
+      destination = Pathname.new(destination)
+
+      if destination.symlink?
+        if destination.readlink == source
+          say_status :identical, destination.expand_path, :blue unless options[:quiet]
+        else
+          say_status :conflict, "#{destination} exists and points to #{destination.readlink}", :red unless options[:quiet]
+
+          if 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 }
+          system "ln -sf #{source} #{destination}" unless options[:pretend]
+        end
+      else
+        say_status :symlink, "#{source.expand_path} to #{destination.expand_path}", :green unless options[:quiet]
+        system "ln -s #{source} #{destination}" unless options[:pretend]
+      end
+    end
+  end
+end

lib/homesick/shell.rb

@@ -0,0 +1,17 @@
+class Homesick
+  # Hack in support for diffing symlinks
+  class Shell < Thor::Shell::Color
+
+    def show_diff(destination, content)
+      destination = Pathname.new(destination)
+
+      if destination.symlink?
+        say "- #{destination.readlink}", :red, true
+        say "+ #{content.expand_path}", :green, true
+      else
+        super
+      end
+    end
+
+  end
+end