@@ -43,6 +43,7 @@ module Integrity end def clone + log "Cloning #{uri} to #{working_directory}" `git clone #{uri} #{working_directory}` end @@ -52,11 +53,13 @@ module Integrity when local_branches.include?(branch) then branch else "-b #{branch} origin/#{branch}" end - + + log "Checking-out #{strategy}" `cd #{working_directory} && git checkout #{strategy}` end def pull + log "Pull-ing in #{working_directory}" `cd #{working_directory} && git pull` end @@ -71,6 +74,10 @@ module Integrity def on_branch? File.basename(`cd #{working_directory} && git symbolic-ref HEAD`).chomp == branch end + + def log(message) + Integrity.logger.info("Git") { message } + end end end end lib/integrity/scm/git.rb @@ -22,6 +22,12 @@ describe Integrity::SCM::Git do @git.name.should == "Git" end + specify "#log should delegate to Integrity#log with 'Git' as progname" do + message = lambda { "message" } + Integrity.logger.should_receive(:info).with("Git") { message } + @git.send(:log, "message") + end + describe "Determining the state of the code for this project" do it "should know if a project has been cloned or not by looking at the directories" do File.stub!(:directory?).with("/var/integrity/exports/foca-integrity/.git").and_return(true) @@ -39,6 +45,29 @@ describe Integrity::SCM::Git do end end + describe "Logging of operations" do + before do + @git.stub!(:`) + Integrity.stub!(:logger).and_return(mock("logger", :info => "")) + end + + it "should log clone" do + @git.should_receive(:log). + with("Cloning git://github.com/foca/integrity.git to /var/integrity/exports/foca-integrity") + @git.clone + end + + it "should log checkout" do + @git.should_receive(:log).with("Checking-out HEAD") + @git.checkout('HEAD') + end + + it "should log pull" do + @git.should_receive(:log).with("Pull-ing in /var/integrity/exports/foca-integrity") + @git.pull + end + end + describe "Fetching the code from the repo" do before do @git.stub!(:on_branch?).and_return(true) spec/scm/git_spec.rb dfd589f421c3850e47034e4dbc43ce3db37e2ad4 Simon Rozet simon@rozet.name http://github.com/foca/integrity/commit/bc3e0a60f2538c117188f6b76ce39a3c4933482a bc3e0a60f2538c117188f6b76ce39a3c4933482a 2008-11-21T16:26:30-08:00 2008-11-21T16:05:45-08:00 log scm operations f35d0560144973053bc672d9670dbafb18aeedfa Simon Rozet simon@rozet.name