buildr 1.3.3-java → 1.3.4-java

data/spec/addon/drb_spec.rb

@@ -0,0 +1,328 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with this
+# work for additional information regarding copyright ownership. The ASF
+# licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+ 
+ 
+require File.expand_path('../spec_helpers', File.dirname(__FILE__))
+require 'stringio'
+Sandbox.require_optional_extension 'buildr/drb'
+
+
+describe Buildr::DRbApplication do 
+
+  module DRbHelper 
+    attr_accessor :app, :drb, :cfg
+
+    def use_stdio(stdin = nil, stdout = nil, stderr = nil)
+      stdin ||= StringIO.new
+      stdout ||= StringIO.new
+      stderr ||= StringIO.new
+      cfg.update :in => stdin, :out => stdout, :err => stderr
+    end
+    
+    def remote_run(*argv)
+      cfg.update :argv => argv
+      drb.remote_run(cfg)
+    end
+
+    def output
+      cfg[:out].string
+    end
+
+    def write_buildfile(content = nil)
+      write 'buildfile', content || %q{
+        define('foo') do
+
+          rule '.rbc' => '.rb' do |t|
+            $stdout.puts "#{t.name} from #{t.source}"
+          end
+
+          task('hello') do 
+            $stdout.puts 'hi'
+          end
+
+          task('empty')
+
+          task('no') do
+            task('empty').enhance ['delete_me']
+            task('empty') { $stdout.puts 'no' }
+          end
+
+          task('delete_me')
+
+          task('create') do
+            Rake::Task.define_task('created')
+            rule '.rbc' => '.rb' do |t|
+               $stdout.puts "#{t.name} from #{t.source}"
+            end
+          end
+
+          task('exists') do
+            $stdout.puts !!Buildr.application.lookup('created')
+          end
+
+          task('setopt', :name, :value) do |task, args|
+            Buildr.application.options.send("#{args[:name]}=", args[:value])
+          end
+        end
+      }
+    end
+  end
+
+  include DRbHelper
+  
+  before(:each) do
+    @in, @out, @err = $stdin, $stdout, $stderr
+    @cfg = {
+      :dir => Dir.pwd, :argv => [],
+      :in => @in, :out => @out, :err => @err
+    }
+    @drb = Buildr::DRbApplication.clone
+    @drb.send :setup
+    @app = Buildr.application
+  end
+
+  after(:each) do
+    $stdin, $stdout, $stderr = @in, @out, @err
+  end
+  
+  describe '.run' do
+    it 'starts server if no server is running' do
+      drb.should_receive(:connect).and_raise DRb::DRbConnError
+      drb.should_receive(:run_server!)
+      drb.should_not_receive(:run_client)
+      drb.run
+    end
+
+    it 'connects to an already started server' do
+      drb.should_receive(:connect).and_return "client"
+      drb.should_receive(:run_client).with "client"
+      drb.should_not_receive(:run_server!)
+      drb.run
+    end
+  end
+
+  describe '.remote_run' do
+    
+    describe 'stdout' do
+      it 'is redirected to client' do 
+        use_stdio
+        Buildr.application.should_receive(:remote_run) do 
+          $stdout.puts "HELLO"
+        end
+        remote_run
+        output.should eql("HELLO\n")
+      end
+    end
+
+    describe 'stderr' do 
+      it 'is redirected to client' do
+        use_stdio
+        Buildr.application.should_receive(:remote_run) do 
+          $stderr.puts "HELLO"
+        end
+        remote_run
+        cfg[:err].string.should eql("HELLO\n")
+      end
+    end
+
+    describe 'stdin' do
+      it 'is redirected to client' do
+        use_stdio
+        cfg[:in].should_receive(:gets).and_return("HELLO\n")
+        result = nil
+        Buildr.application.should_receive(:remote_run) do 
+          result = $stdin.gets
+        end
+        remote_run
+        result.should eql("HELLO\n")
+      end
+    end
+
+    describe 'server ARGV' do
+      it 'is replaced with client argv' do
+        Buildr.application.should_receive(:remote_run) do 
+          ARGV.should eql(['hello'])
+        end
+        remote_run 'hello'
+      end
+    end
+
+    describe 'without buildfile loaded' do
+      before(:each) do
+        app.instance_eval { @rakefile = nil }
+        write_buildfile
+      end
+      
+      it 'should load the buildfile' do
+        app.should_receive(:top_level)
+        lambda { remote_run }.should run_task('foo')
+      end
+    end
+
+    describe 'with unmodified buildfile' do
+      
+      before(:each) do 
+        write_buildfile
+        app.options.rakelib = []
+        app.send :load_buildfile
+        drb.save_snapshot(app)
+      end
+      
+      it 'should not reload the buildfile' do
+        app.should_not_receive(:reload_buildfile)
+        app.should_receive(:top_level)
+        remote_run
+      end
+
+      it 'should not define projects again' do
+        use_stdio
+        lambda { 2.times { remote_run 'foo:hello' } }.should_not run_task('foo')
+        output.should eql("hi\nhi\n")
+      end
+
+      it 'should restore task actions' do
+        use_stdio
+        remote_run 'foo:empty'
+        output.should be_empty
+        2.times { remote_run 'foo:no' }
+        remote_run 'foo:empty'
+        actions = app.lookup('foo:empty').instance_eval { @actions }
+        actions.should be_empty # as originally defined
+        output.should be_empty
+      end
+
+      it 'should restore task prerequisites' do
+        use_stdio
+        remote_run 'foo:empty'
+        output.should be_empty
+        2.times { remote_run 'foo:no' }
+        remote_run 'foo:empty'
+        pres = app.lookup('foo:empty').send(:prerequisites).map(&:to_s)
+        pres.should be_empty # as originally defined
+        output.should be_empty
+      end
+
+      it 'should drop runtime created tasks' do
+        remote_run 'foo:create'
+        app.lookup('created').should_not be_nil
+        remote_run 'foo:empty'
+        app.lookup('created').should be_nil
+      end
+
+      it 'should restore options' do
+        remote_run 'foo:setopt[bar,baz]'
+        app.options.bar.should eql("baz")
+        remote_run 'foo:empty'
+        app.options.bar.should be_nil
+      end
+
+      it 'should restore rules' do
+        orig = app.instance_eval { @rules.size }
+        remote_run 'foo:create'
+        app.instance_eval { @rules.size }.should eql(orig + 1)
+        remote_run 'foo:empty'
+        app.instance_eval { @rules.size }.should eql(orig)
+      end
+            
+    end
+
+    describe 'with modified buildfile' do
+      
+      before(:each) do 
+        write_buildfile
+        app.options.rakelib = []
+        app.send :load_buildfile
+        drb.save_snapshot(app)
+        app.instance_eval { @last_loaded = Time.now - 10 }
+        write_buildfile %q{
+          rule '.rbc' => '.rb' do |t|
+            $stdout.puts "#{t.name} from #{t.source}"
+          end
+          define('foo') do
+            task('hello') do 
+              $stdout.puts 'bye'
+            end
+            task('empty')
+            define('bar') do
+              
+            end
+          end
+        }
+      end
+
+      it 'should reload the buildfile' do
+        app.should_receive(:reload_buildfile)
+        app.should_receive(:top_level)
+        remote_run
+      end
+
+      it 'should redefine projects' do
+        lambda { remote_run }.should run_tasks('foo', 'foo:bar')
+      end
+
+      it 'should remove tasks deleted from buildfile' do
+        app.lookup('foo:delete_me').should_not be_nil
+        remote_run
+        app.lookup('foo:delete_me').should be_nil
+      end
+      
+      it 'should redefine tasks actions' do
+        actions = app.lookup('foo:empty').instance_eval { @actions }
+        actions.should be_empty # no action
+        app.lookup('foo:no').invoke # enhance the empty task
+        actions = app.lookup('foo:empty').instance_eval { @actions }
+        actions.should_not be_empty
+        remote_run # cause to reload the buildfile
+        actions = app.lookup('foo:empty').instance_eval { @actions }
+        actions.should be_empty # as defined on the new buildfile
+      end
+
+      it 'should redefine task prerequisites' do
+        pres = app.lookup('foo:empty').send(:prerequisites).map(&:to_s)
+        pres.should be_empty # no action
+        app.lookup('foo:no').invoke # enhance the empty task
+        pres = app.lookup('foo:empty').send(:prerequisites).map(&:to_s)
+        pres.should_not be_empty
+        remote_run # cause to reload the buildfile
+        pres = app.lookup('foo:empty').send(:prerequisites).map(&:to_s)
+        pres.should be_empty # as defined on the new buildfile
+      end
+
+      it 'should drop runtime created tasks' do
+        app.lookup('foo:create').invoke
+        app.lookup('created').should_not be_nil
+        remote_run 'foo:empty'
+        app.lookup('created').should be_nil
+      end
+
+      it 'should restore options' do
+        app.options.bar = 'baz'
+        remote_run 'foo:empty'
+        app.options.bar.should be_nil
+      end
+
+      it 'should redefine rules' do
+        orig = app.instance_eval { @rules.size }
+        app.lookup('foo:create').invoke
+        app.instance_eval { @rules.size }.should eql(orig + 1)
+        remote_run 'foo:empty'
+        app.instance_eval { @rules.size }.should eql(orig)
+      end
+
+    end
+
+  end
+end
+

data/spec/core/application_spec.rb

@@ -31,44 +31,58 @@ describe Buildr::Application do
 
   describe '#run' do
     it 'should execute *_load methods in order' do
-      last = nil
-      order = [:find_buildfile, :load_gems, :load_artifacts, :load_tasks, 
-               :load_requires, :load_buildfile, :load_imports, :top_level]
+      order = [:load_gems, :load_artifact_ns, :load_tasks, :raw_load_buildfile]
       order.each { |method| Buildr.application.should_receive(method).ordered }
       Buildr.application.stub!(:exit) # With this, shows the correct error instead of SystemExit.
       Buildr.application.run
     end
+
+    it 'should load imports after loading buildfile' do
+      method = Buildr.application.method(:raw_load_buildfile)
+      Buildr.application.should_receive(:raw_load_buildfile) do
+        Buildr.application.should_receive(:load_imports)
+        method.call
+      end
+      Buildr.application.stub!(:exit) # With this, shows the correct error instead of SystemExit.
+      Buildr.application.run
+    end
+
+    it 'should evaluate all projects after loading buildfile' do
+      Buildr.application.should_receive(:load_imports) do
+        Buildr.should_receive(:projects)
+      end
+      Buildr.application.stub!(:exit) # With this, shows the correct error instead of SystemExit.
+      Buildr.application.run
+    end
   end
 
   describe 'environment' do
     it 'should return value of BUILDR_ENV' do
       ENV['BUILDR_ENV'] = 'qa'
-      Buildr::Application.new.environment.should eql('qa')
+      Buildr.application.environment.should eql('qa')
     end
 
     it 'should default to development' do
-      Buildr::Application.new.environment.should eql('development')
+      Buildr.application.environment.should eql('development')
     end
 
     it 'should set environment name from -e argument' do
       ARGV.push('-e', 'test')
-      Buildr::Application.new.environment.should eql('test')
+      Buildr.application.send(:handle_options)
+      Buildr.application.environment.should eql('test')
       ENV['BUILDR_ENV'].should eql('test')
     end
     
     it 'should be echoed to user' do
       write 'buildfile'
-      lambda { Buildr.application.send :load_buildfile }.should show_info(%r{(in .*, development)})
-    end
-    
-    after do
-      ENV['BUILDR_ENV'] = nil
+      ENV['BUILDR_ENV'] = 'spec'
+      Buildr.application.send(:handle_options)
+      lambda { Buildr.application.send :load_buildfile }.should show(%r{(in .*, spec)})
     end
   end
 
   describe 'gems' do
     before do
-      Buildr.application.private_methods(true).should include('load_gems')
       class << Buildr.application
         public :load_gems
       end
@@ -77,8 +91,8 @@ describe Buildr::Application do
     def load_with_yaml
       write 'build.yaml', <<-YAML
         gems:
-        - rspec
-        - rake >= 0.8
+        - rake
+        - rspec >= 1.2
       YAML
       Buildr.application.load_gems
     end
@@ -100,7 +114,7 @@ describe Buildr::Application do
 
     it 'should parse Gem name correctly' do
       load_with_yaml
-      Buildr.application.gems.map(&:name).should include('rake', 'rspec')
+      Buildr.application.gems.map(&:name).should include('rspec', 'rake')
     end
 
     it 'should find installed version of Gem' do
@@ -112,7 +126,6 @@ describe Buildr::Application do
 
   describe 'load_gems' do
     before do
-      Buildr.application.private_methods(true).should include('load_gems')
       class << Buildr.application
         public :load_gems
       end
@@ -312,6 +325,9 @@ describe Buildr, 'settings' do
   end
 
   describe 'profile' do
+    before do
+    end
+
     it 'should be empty hash if no profiles.yaml' do
       Buildr.settings.profile.should == {}
     end
@@ -376,15 +392,6 @@ describe Buildr, 'settings' do
       Buildr.application.send :load_tasks
       Buildr.application.buildfile.timestamp.should be_close(@buildfile_time + 5, 1)
     end
-
-    it 'should include explicitly required files as dependencies' do
-      write 'some/file.rb'; File.utime(@buildfile_time + 5, @buildfile_time + 5, 'some/file.rb')
-      Buildr.application.instance_variable_set(:@requires, ['rbconfig', 'some/file.rb'])
-      Buildr.application.send :load_buildfile
-      Buildr.application.buildfile.timestamp.should be_close(@buildfile_time + 5, 1)
-      Buildr.application.buildfile.prerequisites.should include(File.expand_path('some/file.rb'))
-      Buildr.application.buildfile.prerequisites.should_not include('rbconfig')
-    end
   end
 end
 

data/spec/core/build_spec.rb

@@ -169,6 +169,10 @@ describe Project, '#target' do
     @project.layout[:target] = 'baz'
     @project.target.should eql('baz')
   end
+  
+  it 'should be removed in version 1.5 since it was deprecated in version 1.3' do
+    Buildr::VERSION.should < '1.5'
+  end
 end
 
 
@@ -190,226 +194,432 @@ describe Project, '#reports' do
     @project.layout[:reports] = 'baz'
     @project.reports.should eql('baz')
   end
+  
+  it 'should be removed in version 1.5 since it was deprecated in version 1.3' do
+    Buildr::VERSION.should < '1.5'
+  end
 end
 
 
-describe Buildr::Release do
-  
+describe Git do
+  describe '#uncommitted_files' do
+    it 'should return an empty array on a clean repository' do
+      Git.should_receive(:`).with('git status').and_return <<-EOF
+# On branch master
+nothing to commit (working directory clean)
+      EOF
+      Git.uncommitted_files.should be_empty
+    end
+
+    it 'should reject a dirty repository' do
+      Git.should_receive(:`).with('git status').and_return <<-EOF
+# On branch master
+#
+# Changed but not updated:
+#   (use "git add <file>..." to update what will be committed)
+#   (use "git checkout -- <file>..." to discard changes in working directory)
+#
+#       modified:   lib/buildr.rb
+#       modified:   spec/buildr_spec.rb
+# 
+# Untracked files:
+#   (use "git add <file>..." to include in what will be committed)
+#
+#       error.log
+      EOF
+      Git.uncommitted_files.should include('lib/buildr.rb', 'error.log')
+    end
+  end
+
+  describe '#remote' do
+    it 'should return the name of the corresponding remote' do
+      Git.should_receive(:git).with('config', '--get', 'branch.master.remote').and_return "origin\n"
+      Git.should_receive(:git).with('remote').and_return "upstream\norigin\n"
+      Git.send(:remote, 'master').should == 'origin'
+    end
+
+    it 'should return nil if no remote for the given branch' do
+      Git.should_receive(:git).with('config', '--get', 'branch.master.remote').and_return "\n"
+      Git.should_not_receive(:git).with('remote')
+      Git.send(:remote, 'master').should be_nil
+    end
+  end
+
+  describe '#current_branch' do
+    it 'should return the current branch' do
+      Git.should_receive(:git).with('branch').and_return("  master\n* a-clever-idea\n  ze-great-idea")
+      Git.send(:current_branch).should == 'a-clever-idea'
+    end
+  end
+
+end # of Git
+
+
+describe Svn do
+  describe '#tag' do
+    it 'should remove any existing tag with the same name' do
+      Svn.stub!(:repo_url).and_return('http://my.repo.org/foo/trunk')
+      Svn.stub!(:copy)
+      Svn.should_receive(:remove).with('http://my.repo.org/foo/tags/1.0.0', 'Removing old copy')
+
+      Svn.tag '1.0.0'
+    end
+
+    it 'should do an svn copy with the release version' do
+      Svn.stub!(:repo_url).and_return('http://my.repo.org/foo/trunk')
+      Svn.stub!(:remove)
+      Svn.should_receive(:copy).with(Dir.pwd, 'http://my.repo.org/foo/tags/1.0.0', 'Release 1.0.0')
+
+      Svn.tag '1.0.0'
+    end
+  end
+
+  # Reference: http://svnbook.red-bean.com/en/1.4/svn.reposadmin.planning.html#svn.reposadmin.projects.chooselayout
+  describe '#tag_url' do
+    it 'should accept to tag foo/trunk' do
+      Svn.tag_url('http://my.repo.org/foo/trunk', '1.0.0').should == 'http://my.repo.org/foo/tags/1.0.0'
+    end
+
+    it 'should accept to tag foo/branches/1.0' do
+      Svn.tag_url('http://my.repo.org/foo/branches/1.0', '1.0.1').should == 'http://my.repo.org/foo/tags/1.0.1'
+    end
+
+    it 'should accept to tag trunk/foo' do
+      Svn.tag_url('http://my.repo.org/trunk/foo', '1.0.0').should == 'http://my.repo.org/tags/foo/1.0.0'
+    end
+
+    it 'should accept to tag branches/foo/1.0' do
+      Svn.tag_url('http://my.repo.org/branches/foo/1.0', '1.0.0').should == 'http://my.repo.org/tags/foo/1.0.0'
+    end
+
+    describe '#repo_url' do
+      it 'should extract the SVN URL from svn info' do
+        Svn.should_receive(:svn).and_return <<-XML
+<?xml version="1.0"?>
+<info>
+<entry
+   kind="dir"
+   path="."
+   revision="724987">
+<url>http://my.repo.org/foo/trunk</url>
+<repository>
+<root>http://my.repo.org</root>
+<uuid>13f79535-47bb-0310-9956-ffa450edef68</uuid>
+</repository>
+<wc-info>
+<schedule>normal</schedule>
+<depth>infinity</depth>
+</wc-info>
+<commit
+   revision="724955">
+<author>boisvert</author>
+<date>2008-12-10T01:53:51.240936Z</date>
+</commit>
+</entry>
+</info>
+        XML
+        Svn.repo_url.should == 'http://my.repo.org/foo/trunk'
+      end
+    end
+
+  end
+
+end # of Buildr::Svn
+
+
+describe 'a release process', :shared=>true do
+
   describe '#make' do
     before do
       write 'buildfile', "VERSION_NUMBER = '1.0.0-SNAPSHOT'"
       # Prevent a real call to a spawned buildr process.
-      Release.stub!(:buildr)
-      Svn.stub!(:repo_url).and_return('http://my.repo.org/foo/trunk')
-      Svn.stub!(:uncommitted_files).and_return('')
-      Svn.stub!(:remove)
-      Svn.stub!(:copy)
-      Svn.stub!(:commit)
+      @release.stub!(:buildr)
+      @release.stub!(:check)
+      @release.should_receive(:ruby).with('-S', 'buildr', "_#{Buildr::VERSION}_", '--buildfile', File.expand_path('buildfile.next'),
+                                          '--environment', 'development', 'clean', 'upload', 'DEBUG=no')
     end
     
     it 'should tag a release with the release version' do
-      Svn.should_receive(:copy).with(Dir.pwd, 'http://my.repo.org/foo/tags/1.0.0', 'Release 1.0.0').and_return {
-        file('buildfile').should contain('VERSION_NUMBER = "1.0.0"')
-      }
-      Release.make
+      @release.stub!(:update_version_to_next)
+      @release.should_receive(:tag_release).with('1.0.0')
+      @release.make
+    end
+
+    it 'should not alter the buildfile before tagging' do
+      @release.stub!(:update_version_to_next)
+      @release.should_receive(:tag_release).with('1.0.0')
+      @release.make
+      file('buildfile').should contain('VERSION_NUMBER = "1.0.0"')
     end
 
     it 'should update the buildfile with the next version number' do
-      Release.make
+      @release.stub!(:tag_release)
+      @release.make
       file('buildfile').should contain('VERSION_NUMBER = "1.0.1-SNAPSHOT"')
     end
 
     it 'should commit the updated buildfile' do
-      Svn.should_receive(:commit).with(File.expand_path('buildfile'), 'Changed version number to 1.0.1-SNAPSHOT').and_return {
-        file('buildfile').should contain('VERSION_NUMBER = "1.0.1-SNAPSHOT"')
-      }
-      Release.make
+      @release.stub!(:tag_release)
+      @release.make
+      file('buildfile').should contain('VERSION_NUMBER = "1.0.1-SNAPSHOT"')
     end    
   end
 
-
-  describe '#check' do
+  describe '#resolve_tag' do
     before do
-      Svn.stub!(:uncommitted_files).and_return('')
-    end
-
-    it 'should accept to release from the trunk' do
-      Svn.stub!(:repo_url).and_return('http://my.repo.org/foo/trunk')
-      lambda { Release.check }.should_not raise_error
+      @release.stub!(:extract_version).and_return('1.0.0')
     end
 
-    it 'should accept to release from a branch' do
-      Svn.stub!(:repo_url).and_return('http://my.repo.org/foo/branches/1.0')
-      lambda { Release.check }.should_not raise_error
-    end
-
-    it 'should reject releasing from a tag' do
-      Svn.stub!(:repo_url).and_return('http://my.repo.org/foo/tags/1.0.0')
-      lambda { Release.check }.should raise_error(RuntimeError, "SVN URL must contain 'trunk' or 'branches/...'")
+    it 'should return tag specified by tag_name' do
+      @release.tag_name  = 'first'
+      @release.send(:resolve_tag).should == 'first'
     end
-
-    it 'should reject a non standard repository layout' do
-      Svn.stub!(:repo_url).and_return('http://my.repo.org/foo/bar')
-      lambda { Release.check }.should raise_error(RuntimeError, "SVN URL must contain 'trunk' or 'branches/...'")
+    
+    it 'should use tag returned by tag_name if tag_name is a proc' do
+      @release.tag_name  = lambda { |version| "buildr-#{version}" }
+      @release.send(:resolve_tag).should == 'buildr-1.0.0'
     end
+    after { @release.tag_name = nil }
+  end
 
-    it 'should reject an uncommitted file' do
-      Svn.stub!(:repo_url).and_return('http://my.repo.org/foo/trunk')
-      Svn.stub!(:uncommitted_files).and_return('M      foo.rb')
-      lambda { Release.check }.should raise_error(RuntimeError,
-        "Uncommitted SVN files violate the First Principle Of Release!\n" +
-        "M      foo.rb")
+  describe '#tag_release' do
+    it 'should inform the user' do
+      @release.stub!(:extract_version).and_return('1.0.0')
+      lambda { @release.tag_release('1.0.0') }.should show_info('Tagging release 1.0.0')
     end
   end
-  
-  
+
   describe '#extract_version' do
     it 'should extract VERSION_NUMBER with single quotes' do
       write 'buildfile', "VERSION_NUMBER = '1.0.0-SNAPSHOT'"
-      Release.extract_version.should == '1.0.0-SNAPSHOT'
+      @release.extract_version.should == '1.0.0-SNAPSHOT'
     end
 
     it 'should extract VERSION_NUMBER with double quotes' do
       write 'buildfile', %{VERSION_NUMBER = "1.0.1-SNAPSHOT"}
-      Release.extract_version.should == '1.0.1-SNAPSHOT'
+      @release.extract_version.should == '1.0.1-SNAPSHOT'
     end
 
     it 'should extract VERSION_NUMBER without any spaces' do
       write 'buildfile', "VERSION_NUMBER='1.0.2-SNAPSHOT'"
-      Release.extract_version.should == '1.0.2-SNAPSHOT'
+      @release.extract_version.should == '1.0.2-SNAPSHOT'
     end
 
     it 'should extract THIS_VERSION as an alternative to VERSION_NUMBER' do
       write 'buildfile', "THIS_VERSION = '1.0.3-SNAPSHOT'"
-      Release.extract_version.should == '1.0.3-SNAPSHOT'
+      @release.extract_version.should == '1.0.3-SNAPSHOT'
     end
 
     it 'should complain if no current version number' do
       write 'buildfile', 'define foo'
-      lambda { Release.extract_version }.should raise_error('Looking for THIS_VERSION = "..." in your Buildfile, none found')
+      lambda { @release.extract_version }.should raise_error('Looking for THIS_VERSION = "..." in your Buildfile, none found')
     end
   end
 
+  describe '#with_release_candidate_version' do
+    before do
+      Buildr.application.stub!(:buildfile).and_return(file('buildfile'))
+      write 'buildfile', "THIS_VERSION = '1.1.0-SNAPSHOT'"
+    end
+
+    it 'should yield the name of the release candidate buildfile' do
+      @release.send :with_release_candidate_version do |new_filename|
+        File.read(new_filename).should == %{THIS_VERSION = "1.1.0"}
+      end
+    end
 
-  # Reference: http://svnbook.red-bean.com/en/1.4/svn.reposadmin.planning.html#svn.reposadmin.projects.chooselayout
-  describe '#tag url' do
-    it 'should accept to tag foo/trunk' do
-      Release.tag_url('http://my.repo.org/foo/trunk', '1.0.0').should == 'http://my.repo.org/foo/tags/1.0.0'
+    it 'should yield a name different from the original buildfile' do
+      @release.send :with_release_candidate_version do |new_filename|
+        new_filename.should_not point_to_path('buildfile')
+      end
     end
+  end
 
-    it 'should accept to tag foo/branches/1.0' do
-      Release.tag_url('http://my.repo.org/foo/branches/1.0', '1.0.1').should == 'http://my.repo.org/foo/tags/1.0.1'
+  describe '#update_version_to_next' do
+    before do
+      write 'buildfile', 'THIS_VERSION = "1.0.0"'
     end
 
-    it 'should accept to tag trunk/foo' do
-      Release.tag_url('http://my.repo.org/trunk/foo', '1.0.0').should == 'http://my.repo.org/tags/foo/1.0.0'
+    it 'should update the buildfile with a new version number' do
+      @release.send :update_version_to_next
+      file('buildfile').should contain('THIS_VERSION = "1.0.1-SNAPSHOT"')
     end
 
-    it 'should accept to tag branches/foo/1.0' do
-      Release.tag_url('http://my.repo.org/branches/foo/1.0', '1.0.0').should == 'http://my.repo.org/tags/foo/1.0.0'
+    it 'should commit the new buildfile on the trunk' do
+      @release.should_receive(:message).and_return('Changed version number to 1.0.1-SNAPSHOT')
+      @release.update_version_to_next
     end
-    
-    it 'should use tag specified by tag_name' do
-      Release.tag_name  = 'first'
-      Release.tag_url('http://my.repo.org/foo/trunk', '1.0.0').should == 'http://my.repo.org/foo/tags/first'
+
+    it 'should use the commit message specified by commit_message' do
+      @release.commit_message  = 'Here is my custom message'
+      @release.should_receive(:message).and_return('Here is my custom message')
+      @release.update_version_to_next
     end
     
-    it 'should use tag returned by tag_name if tag_name is a proc' do
-      Release.tag_name  = lambda { |version| "buildr-#{version}" }
-      Release.tag_url('http://my.repo.org/foo/trunk', '1.0.0').should == 'http://my.repo.org/foo/tags/buildr-1.0.0'
+    it 'should use the commit message returned by commit_message if commit_message is a proc' do
+      @release.commit_message  = lambda { |new_version| 
+        new_version.should == '1.0.1-SNAPSHOT'
+        "increment version number to #{new_version}"
+      }
+      @release.should_receive(:message).and_return('increment version number to 1.0.1-SNAPSHOT')
+      @release.update_version_to_next
+    end
+
+    it 'should inform the user of the new version' do
+      lambda { @release.update_version_to_next }.should show_info('Current version is now 1.0.1-SNAPSHOT')
     end
-    
-    after { Release.tag_name = nil }
   end
 
+end
 
-  describe '#with_release_candidate_version' do
+
+describe GitRelease do
+  it_should_behave_like 'a release process'
+
+  before do
+    @release = GitRelease.new
+    Git.stub!(:git)
+    Git.stub!(:current_branch).and_return('master')
+  end
+
+  describe '#applies_to?' do
+    it 'should reject a non-git repo' do
+      GitRelease.applies_to?.should be_false
+    end
+
+    it 'should accept a git repo' do
+      FileUtils.mkdir '.git'
+      FileUtils.touch File.join('.git', 'config')
+      GitRelease.applies_to?.should be_true 
+    end
+  end
+
+  describe '#release_check' do
     before do
-      Buildr.application.stub!(:buildfile).and_return(file('buildfile'))
-      write 'buildfile', "THIS_VERSION = '1.1.0-SNAPSHOT'"
+      @release = GitRelease.new
     end
 
-    it 'should yield the name of the release candidate buildfile' do
-      Release.send :with_release_candidate_version do |new_filename|
-        File.read(new_filename).should == %{THIS_VERSION = "1.1.0"}
-      end
+    it 'should accept a clean repository' do
+      Git.should_receive(:`).with('git status').and_return <<-EOF
+# On branch master
+nothing to commit (working directory clean)
+      EOF
+      Git.should_receive(:remote).and_return('master')
+      lambda { @release.check }.should_not raise_error
     end
 
-    it 'should yield a name different from the original buildfile' do
-      Release.send :with_release_candidate_version do |new_filename|
-        new_filename.should_not point_to_path('buildfile')
-      end
+    it 'should reject a dirty repository' do
+      Git.should_receive(:`).with('git status').and_return <<-EOF
+# On branch master
+# Untracked files:
+#   (use "git add <file>..." to include in what will be committed)
+#
+#       foo.temp
+EOF
+      lambda { @release.check }.should raise_error(RuntimeError, /uncommitted files/i)
     end
-  end
 
+    it 'should reject a repository not tracking remote branch' do
+      Git.should_receive(:uncommitted_files).and_return([])
+      Git.should_receive(:remote).and_return(nil)
+      lambda{ @release.check }.should raise_error(RuntimeError,
+        "You are releasing from a local branch that does not track a remote!")
+    end
+  end
 
   describe '#tag_release' do
     before do
-      write 'buildfile', "THIS_VERSION = '1.0.1'"
-      Svn.stub!(:repo_url).and_return('http://my.repo.org/foo/trunk')
-      Svn.stub!(:copy)
-      Svn.stub!(:remove)
+      @release = GitRelease.new
+      @release.stub!(:extract_version).and_return('1.0.1')
+      @release.stub!(:resolve_tag).and_return('TEST_TAG')
+      Git.stub!(:git).with('tag', '-a', 'TEST_TAG', '-m', '[buildr] Cutting release TEST_TAG')
+      Git.stub!(:git).with('push', 'origin', 'tag', 'TEST_TAG')
+      Git.stub!(:commit)
+      Git.stub!(:push)
+      Git.stub!(:remote).and_return('origin')
     end
 
-    it 'should tag the working copy' do
-      Svn.should_receive(:copy).with(Dir.pwd, 'http://my.repo.org/foo/tags/1.0.1', 'Release 1.0.1')
-      Release.send :tag_release
+    it 'should delete any existing tag with the same name' do
+      Git.should_receive(:git).with('tag', '-d', 'TEST_TAG')
+      Git.should_receive(:git).with('push', 'origin', ':refs/tags/TEST_TAG')
+      @release.tag_release 'TEST_TAG'
     end
 
-    it 'should remove the tag if it already exists' do
-      Svn.should_receive(:remove).with('http://my.repo.org/foo/tags/1.0.1', 'Removing old copy')
-      Release.send :tag_release
+    it 'should commit the buildfile before tagging' do
+      Git.should_receive(:commit).with(File.basename(Buildr.application.buildfile.to_s), "Changed version number to 1.0.1")
+      @release.tag_release 'TEST_TAG'
     end
 
-    it 'should accept that the tag does not exist' do
-      Svn.stub!(:remove).and_raise(RuntimeError)
-      Release.send :tag_release
+    it 'should push the tag if a remote is tracked' do
+      Git.should_receive(:git).with('tag', '-d', 'TEST_TAG')
+      Git.should_receive(:git).with('push', 'origin', ':refs/tags/TEST_TAG')
+      Git.should_receive(:git).with('tag', '-a', 'TEST_TAG', '-m', '[buildr] Cutting release TEST_TAG')
+      Git.should_receive(:git).with('push', 'origin', 'tag',  'TEST_TAG')
+      @release.tag_release 'TEST_TAG'
     end
 
-    it 'should inform the user' do
-      lambda { Release.send :tag_release }.should show_info('Tagging release 1.0.1')
+    it 'should NOT push the tag if no remote is tracked' do
+      Git.stub!(:remote).and_return(nil)
+      Git.should_not_receive(:git).with('push', 'origin', 'tag',  'TEST_TAG')
+      @release.tag_release 'TEST_TAG'
     end
   end
+end
+
 
+describe SvnRelease do
+  it_should_behave_like 'a release process'
 
-  describe '#commit_new_snapshot' do
+  before do
+    @release = SvnRelease.new
+    Svn.stub!(:svn)
+    Svn.stub!(:repo_url).and_return('http://my.repo.org/foo/trunk')
+    Svn.stub!(:tag)
+  end
+
+  describe '#applies_to?' do
+    it 'should reject a non-git repo' do
+      SvnRelease.applies_to?.should be_false
+    end
+
+    it 'should accept a git repo' do
+      FileUtils.touch '.svn'
+      SvnRelease.applies_to?.should be_true 
+    end
+  end
+
+  describe '#check' do
     before do
-      write 'buildfile', 'THIS_VERSION = "1.0.0"'
-      Svn.stub!(:commit)
+      Svn.stub!(:uncommitted_files).and_return([])
+      @release = SvnRelease.new
     end
 
-    it 'should update the buildfile with a new version number' do
-      Release.send :commit_new_snapshot
-      file('buildfile').should contain('THIS_VERSION = "1.0.1-SNAPSHOT"')
+    it 'should accept to release from the trunk' do
+      Svn.stub!(:repo_url).and_return('http://my.repo.org/foo/trunk')
+      lambda { @release.check }.should_not raise_error
     end
 
-    it 'should commit the new buildfile on the trunk' do
-      Svn.should_receive(:commit).with(File.expand_path('buildfile'), 'Changed version number to 1.0.1-SNAPSHOT')
-      Release.send :commit_new_snapshot
+    it 'should accept to release from a branch' do
+      Svn.stub!(:repo_url).and_return('http://my.repo.org/foo/branches/1.0')
+      lambda { @release.check }.should_not raise_error
     end
 
-    it 'should inform the user of the new version' do
-      lambda { Release.send :commit_new_snapshot }.should show_info('Current version is now 1.0.1-SNAPSHOT')
+    it 'should reject releasing from a tag' do
+      Svn.stub!(:repo_url).and_return('http://my.repo.org/foo/tags/1.0.0')
+      lambda { @release.check }.should raise_error(RuntimeError, "SVN URL must contain 'trunk' or 'branches/...'")
     end
-  end
-  
-end
 
+    it 'should reject a non standard repository layout' do
+      Svn.stub!(:repo_url).and_return('http://my.repo.org/foo/bar')
+      lambda { @release.check }.should raise_error(RuntimeError, "SVN URL must contain 'trunk' or 'branches/...'")
+    end
 
-describe Buildr::Svn, '#repo_url' do
-  it 'should extract the SVN URL from svn info' do
-    Svn.stub!(:svn, 'info').and_return(<<EOF)
-Path: .
-URL: http://my.repo.org/foo/trunk
-Repository Root: http://my.repo.org
-Repository UUID: 12345678-9abc-def0-1234-56789abcdef0
-Revision: 112
-Node Kind: directory
-Schedule: normal
-Last Changed Author: Lacton
-Last Changed Rev: 110
-Last Changed Date: 2008-08-19 12:00:00 +0200 (Tue, 19 Aug 2008)
-EOF
-    Svn.repo_url.should == 'http://my.repo.org/foo/trunk'
+    it 'should reject an uncommitted file' do
+      Svn.stub!(:repo_url).and_return('http://my.repo.org/foo/trunk')
+      Svn.stub!(:uncommitted_files).and_return(['foo.rb'])
+      lambda { @release.check }.should raise_error(RuntimeError,
+        "Uncommitted files violate the First Principle Of Release!\n" +
+        "foo.rb")
+    end
   end
-end
+end