From 02262ee67679dcd6c69ade17d0518b93a1454b26 Mon Sep 17 00:00:00 2001
From: Adrian Mowat <adrian.mowat@gmail.com>
Date: Wed, 21 Sep 2011 07:24:10 +0100
Subject: [PATCH] Created Git class to wrap calls to git and checking for
 errors

---
 retreat_gem/lib/coderetreat/retreat.rb | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/retreat_gem/lib/coderetreat/retreat.rb b/retreat_gem/lib/coderetreat/retreat.rb
index 0ed86fd..44827be 100644
--- a/retreat_gem/lib/coderetreat/retreat.rb
+++ b/retreat_gem/lib/coderetreat/retreat.rb
@@ -63,6 +63,13 @@ def self.clone(source_repo, local_repo)
       %x{git clone #{source_repo} #{local_repo}}
       raise EnvError.new("Could not clone #{source_repo}") unless $? == 0
     end
+    
+    def self.pull(local_repo)
+      local_repo.flip_into_and_run do
+        %x{git pull origin master}
+        raise EnvError.new("Could not pull origin master into #{local_repo}") unless $? == 0
+      end
+    end
   end
   
   module Actions
@@ -107,8 +114,7 @@ def self.run!
       def run!
         validate_environment!
         puts "Pulling coderetreat repo into #{@local_repo}..."
-        %x{git clone #{@source_repo} #{@local_repo}}
-        raise EnvError.new("Installation failed - could not clone github repo") unless $? == 0
+        Git.clone @source_repo, @local_repo
         puts "\nInstallation completed!  Here is some information..."        
         Info.run!
         puts "\nRun 'retreat start <language> [location]' to start a new iteration"
@@ -129,7 +135,7 @@ def self.run!
       def run!
         validate_environment!
         puts "Updating sources at #{@local_repo}"
-        @local_repo.flip_into_and_run { %x!git pull origin master! }
+        Git.pull @local_repo
       end
       
       def validate_environment!
@@ -154,7 +160,7 @@ def message
         result =<<EOS
   Source Repo: #{@source_repo}
   Local Repo: #{@local_repo}
-  Languages Available: #{languages.join(",")}
+  Languages Available: #{languages.join(", ")}
 EOS
      
       result