use CommandRunner in Checkout#head

lib/integrity/checkout.rb

@@ -2,7 +2,7 @@ module Integrity
   class Checkout
     def initialize(repo, commit, directory, logger)
       @repo      = repo
-      @commit    = commit == "HEAD" ? head : commit
+      @commit    = commit
       @directory = directory
       @logger    = logger
     end
@@ -13,7 +13,7 @@ def run
       in_dir do |c|
         c.run! "git fetch origin"
         c.run! "git checkout origin/#{@repo.branch}"
-        c.run! "git reset --hard #{@commit}"
+        c.run! "git reset --hard #{sha1}"
       end
     end
 
@@ -22,13 +22,16 @@ def metadata
         "<%ae>%nmessage: >-%n  %s%ncommitted_at: %ci%n"
 
       dump = YAML.load(`cd #{@directory} && git show -s \
-        --pretty=format:"#{format}" #{@commit}`)
+        --pretty=format:"#{format}" #{sha1}`)
 
       dump.update("committed_at" => Time.parse(dump["committed_at"]))
     end
 
     def head
-      `git ls-remote --heads #{@repo.uri} #{@repo.branch} | cut -f1`.chomp
+      runner.run!(
+        "git ls-remote --heads #{@repo.uri} #{@repo.branch} " \
+          "| cut -f1"
+      )
     end
 
     def run_in_dir(command)
@@ -42,5 +45,9 @@ def in_dir(&block)
     def runner
       @runner ||= CommandRunner.new(@logger)
     end
+
+    def sha1
+      @sha1 ||= @commit == "HEAD" ? head : @commit
+    end
   end
 end

lib/integrity/command_runner.rb

@@ -21,7 +21,7 @@ def run(command)
       output = ""
       IO.popen(cmd, "r") { |io| output = io.read }
 
-      [$?.success?, output]
+      [$?.success?, output.chomp]
     end
 
     def run!(command)
@@ -31,6 +31,8 @@ def run!(command)
         @logger.error(output.inspect)
         raise Error, "Failed to run '#{command}'"
       end
+
+      output
     end
 
     def normalize(cmd)

test/acceptance/campfire_notification_test.rb

@@ -81,7 +81,6 @@ def build
 Commit Author: #{build_commit["author"]["name"]}
 
 Running tests...
-
 EOM
 
     paste_payload = {