Regenerated gemspec for version 0.5.4

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

Gemfile

@@ -1,8 +1,7 @@
+source :gemcutter
+
 # Add dependencies required to use your gem here.
-group :runtime do
+gem "thor", ">= 0.14.0"
-  #gem 'bundler', '>= 0.9.5'
-  gem "thor"
-end
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
@@ -10,7 +9,7 @@ group :development do
   gem "rake"
   gem "rspec", ">= 1.2.9"
   gem "bundler", ">= 0.9.5"
-  gem "jeweler", ">= 1.4.0"
+  gem "jeweler", ">= 1.5.0.pre"
   gem "rcov", ">= 0"
   gem "test-construct"
 end

Gemfile.lock

@@ -0,0 +1,25 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    git (1.2.5)
+    jeweler (1.5.0.pre)
+      bundler (>= 1.0.0.rc.5)
+      git (>= 1.2.5)
+      rake
+    rake (0.8.7)
+    rcov (0.9.8)
+    rspec (1.3.0)
+    test-construct (1.2.0)
+    thor (0.14.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (>= 0.9.5)
+  jeweler (>= 1.5.0.pre)
+  rake
+  rcov
+  rspec (>= 1.2.9)
+  test-construct
+  thor (>= 0.14.0)

Rakefile

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'bundler'
 begin
-  Bundler.setup(:runtime, :development)
+  Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
   $stderr.puts e.message
   $stderr.puts "Run `bundle install` to install missing gems"
@@ -14,7 +14,7 @@ Jeweler::Tasks.new do |gem|
   gem.name = "homesick"
   gem.summary = %Q{A man's home is his castle. Never leave your dotfiles behind.}
   gem.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.
 
     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. 
 
@@ -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.1"
+  gem.version = "0.5.4"
   # Have dependencies? Add them to Gemfile
 
   # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings

homesick.gemspec

@@ -5,14 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{homesick}
-  s.version = "0.5.1"
+  s.version = "0.5.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joshua Nichols"]
-  s.date = %q{2010-05-18}
+  s.date = %q{2010-09-03}
   s.default_executable = %q{homesick}
   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.
 
     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. 
 
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
     ".gitignore",
     "ChangeLog.markdown",
     "Gemfile",
+    "Gemfile.lock",
     "LICENSE",
     "README.markdown",
     "Rakefile",
@@ -42,7 +43,6 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/technicalpickles/homesick}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{A man's home is his castle. Never leave your dotfiles behind.}
@@ -56,28 +56,28 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<thor>, [">= 0"])
+      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.4.0"])
+      s.add_development_dependency(%q<jeweler>, [">= 1.5.0.pre"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<test-construct>, [">= 0"])
     else
-      s.add_dependency(%q<thor>, [">= 0"])
+      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.4.0"])
+      s.add_dependency(%q<jeweler>, [">= 1.5.0.pre"])
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<test-construct>, [">= 0"])
     end
   else
-    s.add_dependency(%q<thor>, [">= 0"])
+    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.4.0"])
+    s.add_dependency(%q<jeweler>, [">= 1.5.0.pre"])
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<test-construct>, [">= 0"])
   end

lib/homesick.rb

@@ -27,12 +27,14 @@ class Homesick < Thor
       elsif uri =~ GITHUB_NAME_REPO_PATTERN
         destination = Pathname.new($1)
         git_clone "git://github.com/#{$1}.git", :destination => destination
-      else
+      elsif uri =~ /\/([^\/]*)(\.git)?\Z/
-        if uri =~ /\/([^\/]*).git\Z/
+        destination = Pathname.new($1)
-          destination = Pathname.new($1)
-        end
-
         git_clone uri
+      elsif uri =~ /[^:]+:([^:]+)(\.git)?\Z/
+        destination = Pathname.new($1)
+        git_clone uri
+      else
+        raise "Unknown URI format: #{uri}"
       end
 
       if destination.join('.gitmodules').exist?

lib/homesick/actions.rb

@@ -69,14 +69,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

@@ -34,6 +34,30 @@ describe Homesick do
       @homesick.clone 'http://github.com/technicalpickles/pickled-vim.git'
     end
 
+    it "should clone git repo like http://host/path/to" do
+      @homesick.should_receive(:git_clone).with('http://github.com/technicalpickles/pickled-vim')
+
+      @homesick.clone 'http://github.com/technicalpickles/pickled-vim'
+    end
+
+    it "should clone git repo like host-alias:repos.git" do
+      @homesick.should_receive(:git_clone).with('gitolite:pickled-vim.git')
+
+      @homesick.clone 'gitolite:pickled-vim.git'
+    end
+
+    it "should not try to clone a malformed uri like malformed" do
+      @homesick.should_not_receive(:git_clone)
+
+      @homesick.clone 'malformed' rescue nil
+    end
+
+    it "should throw an exception when trying to clone a malformed uri like malformed" do
+      lambda {
+        @homesick.clone 'malformed'
+      }.should raise_error
+    end
+
     it "should clone a github repo" do
       @homesick.should_receive(:git_clone).with('git://github.com/wfarr/dotfiles.git', :destination => Pathname.new('wfarr/dotfiles'))