merge #with_latest_code with #with_revision [integrity#5 state:resolved]

lib/integrity/builder.rb

@@ -11,12 +11,8 @@ def initialize(project)
       @build = Build.new(:project => project)
     end
 
-    def build(commit=nil)
-      if commit
-        @scm.with_revision(commit) { run_build_script }
-      else
-        @scm.with_latest_code { run_build_script }
-      end
+    def build(commit='origin/HEAD')
+      @scm.with_revision(commit) { run_build_script }
       @build
     ensure
       @build.commit = @scm.head

lib/integrity/scm/git.rb

@@ -9,11 +9,6 @@ def initialize(uri, branch, working_directory)
         @working_directory = working_directory
       end
 
-      def with_latest_code(&block)
-        fetch_code
-        chdir(&block)
-      end
-
       def with_revision(revision, &block)
         fetch_code
         checkout(revision)

spec/builder_spec.rb

@@ -18,7 +18,7 @@ def mock_build(messages={})
 
   def mock_scm(messages={})
     @scm ||= begin
-      messages = { :with_latest_code => true, :head => Hash.new }.merge(messages)
+      messages = { :with_revision => true, :head => Hash.new }.merge(messages)
       mock("scm", messages)
     end
   end
@@ -62,7 +62,7 @@ def mock_scm(messages={})
     before { @builder.stub!(:run_build_script) }
 
     it "should fetch the latest code from the scm and run the build script" do
-      mock_scm.should_receive(:with_latest_code).and_yield do
+      mock_scm.should_receive(:with_revision).with('origin/HEAD').and_yield do
         @builder.should_receive(:run_build_script)
       end
       @builder.build
@@ -88,7 +88,7 @@ def mock_scm(messages={})
 
     it "should save the build even if there's an exception" do
       lambda {
-        mock_scm.should_receive(:with_latest_code).and_raise(RuntimeError)
+        mock_scm.should_receive(:with_revision).and_raise(RuntimeError)
         mock_build.should_receive(:save)
         @builder.build
       }.should raise_error(RuntimeError)

spec/scm/git_spec.rb

@@ -82,48 +82,30 @@
     end
   end
 
-  describe "Running code in the context of the most recent checkout" do
-    before do
-      @block = lambda { "cuack" }
-      @git.stub!(:fetch_code)
-      @git.stub!(:chdir).with(&@block)
-    end
-
-    it "should ensure it has the latest code" do
-      @git.should_receive(:fetch_code)
-      @git.with_latest_code(&@block)
-    end
-
-    it "should run the block in the working copy directory" do
-      @git.should_receive(:chdir).with(&@block).and_yield
-      @git.with_latest_code(&@block)
-    end
-  end
-
-  describe 'Running code in the context of a specific revision' do
-    before do
-      @block = proc { 'lambda the ultimate' }
+  describe 'Running code in a specific context using #with_revision' do
+    before(:each) do
+      @block = lambda { 'lambda the ultimate' }
       @git.stub!(:fetch_code)
       @git.stub!(:checkout)
       @git.stub!(:chdir).with(&@block)
     end
 
-    it 'should fetch the lastest code' do
+    it "should fetch the latest code" do
       @git.should_receive(:fetch_code)
-      @git.with_revision('4d0cfafd569ef60d0c578bf8a9d51f9582612f03', &@block)
+      @git.with_revision('HEAD', &@block)
     end
 
-    it 'should revert the working directory to the given commit' do
+    it 'should checkout the given revision' do
       @git.should_receive(:checkout).with('4d0cfafd569ef60d0c578bf8a9d51f9582612f03')
       @git.with_revision('4d0cfafd569ef60d0c578bf8a9d51f9582612f03', &@block)
     end
 
-    it 'should run the block in the working directory' do
+    it "should run the block in the working copy directory" do
       @git.should_receive(:chdir).with(&@block).and_yield
       @git.with_revision('4d0cfafd569ef60d0c578bf8a9d51f9582612f03', &@block)
     end
 
-    it 'should ensure that it checkout origin/HEAD after' do
+    it 'should ensure it checkout origin/HEAD' do
       @git.should_receive(:checkout).with('origin/HEAD')
       @git.with_revision('4d0cfafd569ef60d0c578bf8a9d51f9582612f03', &@block)
     end