@@ -2,40 +2,58 @@ require File.join(File.dirname(__FILE__), *%w[example_helper]) describe CapGun::Presenter do - describe "git details" do + describe "scm details" do - it "does nothing if git is not the scm" do - presenter = CapGun::Presenter.new(stub("capistrano", :scm => :svn)) - presenter.git_details.should == nil + it "does nothing if the scm is not git nor subversion" do + presenter = CapGun::Presenter.new(stub("capistrano", :scm => :mercurial)) + presenter.scm_details.should == nil end it "collects branch and git log details if git is scm" do capistrano = {:scm => :git, :branch => "edge"} presenter = CapGun::Presenter.new(capistrano) - presenter.expects(:git_log).returns("xxxxx") + presenter.expects(:scm_log).returns("xxxxx") - details = presenter.git_details + details = presenter.scm_details details.should include("Branch: edge") details.should include("xxxxx") end end - describe "git log messages" do + describe "scm log messages" do + describe "with git" do + it "returns N/A if the git log call returns an error" do + capistrano = {:scm => :git, :previous_revision => "previous-sha", :current_revision => "current-sha" } + presenter = CapGun::Presenter.new(capistrano) + presenter.stubs(:`).returns("fatal: Not a git repo") + presenter.stubs(:exit_code).returns(stub("process status", :success? => false)) + presenter.scm_log_messages.should == "N/A" + end - it "returns N/A if the git log call returns an error" do - capistrano = { :previous_revision => "previous-sha", :current_revision => "current-sha" } - presenter = CapGun::Presenter.new(capistrano) - presenter.stubs(:`).returns("fatal: Not a git repo") - presenter.stubs(:exit_code).returns(stub("process status", :success? => false)) - presenter.git_log_messages.should == "N/A" + it "calls git log with previous_rev..current_rev" do + capistrano = {:scm => :git, :previous_revision => "previous-sha", :current_revision => "current-sha" } + presenter = CapGun::Presenter.new(capistrano) + presenter.stubs(:exit_code).returns(stub("process status", :success? => true)) + presenter.expects(:`).with(includes("git log previous-sha..current-sha")) + presenter.scm_log_messages + end end - - it "calls git log with previous_rev..current_rev" do - capistrano = { :previous_revision => "previous-sha", :current_revision => "current-sha" } - presenter = CapGun::Presenter.new(capistrano) - presenter.stubs(:exit_code).returns(stub("process status", :success? => true)) - presenter.expects(:`).with(includes("git log previous-sha..current-sha")) - presenter.git_log_messages + describe "with subversion" do + it "returns N/A if the svn log call returns an error" do + capistrano = {:scm => :subversion, :previous_revision => "42", :current_revision => "46" } + presenter = CapGun::Presenter.new(capistrano) + presenter.stubs(:`).returns("fatal: Not a working copy") + presenter.stubs(:exit_code).returns(stub("process status", :success? => false)) + presenter.scm_log_messages.should == "N/A" + end + + it "calls svn log with -r previous_rev+1:current_rev" do + capistrano = {:scm => :subversion, :previous_revision => "42", :current_revision => "46" } + presenter = CapGun::Presenter.new(capistrano) + presenter.stubs(:exit_code).returns(stub("process status", :success? => true)) + presenter.expects(:`).with(includes("svn log -r 43:46")) + presenter.scm_log_messages + end end end examples/presenter_example.rb @@ -41,29 +41,36 @@ module CapGun "Branch: #{capistrano[:branch]}" unless capistrano[:branch].nil? || capistrano[:branch].empty? end - def git_details - return unless capistrano[:scm].to_sym == :git + def scm_details + return unless [:git,:subversion].include? capistrano[:scm].to_sym <<-EOL #{branch} -#{git_log} +#{scm_log} EOL rescue nil end - def git_log - "\nCommits since last release\n====================\n#{git_log_messages}" + def scm_log + "\nCommits since last release\n====================\n#{scm_log_messages}" end - def git_log_messages - messages = `git log #{capistrano[:previous_revision]}..#{capistrano[:current_revision]} --pretty=format:%h:%s` + def scm_log_messages + messages = case capistrano[:scm].to_sym + when :git + `git log #{capistrano[:previous_revision]}..#{capistrano[:current_revision]} --pretty=format:%h:%s` + when :subversion + `svn log -r #{capistrano[:previous_revision].to_i+1}:#{capistrano[:current_revision]}` + else + "N/A" + end exit_code.success? ? messages : "N/A" end - + def exit_code $? end - + # Gives you a prettier date/time for output from the standard Capistrano timestamped release directory. # This assumes Capistrano uses UTC for its date/timestamped directories, and converts to the local # machine timezone. @@ -125,7 +132,7 @@ Previous Release Revision: #{capistrano[:previous_revision]} Repository: #{capistrano[:repository]} Deploy path: #{capistrano[:deploy_to]} Domain: #{capistrano[:domain]} -#{git_details} +#{scm_details} EOL end lib/cap_gun/presenter.rb af41053984486bc5ac5ea81b1daa8fbe2ce238cf Olivier Brisse ouranos@donarproject.org http://github.com/relevance/cap_gun/commit/6a8e79d8a2e0357afe081ac681a5e40bcc982d9a 6a8e79d8a2e0357afe081ac681a5e40bcc982d9a 2009-11-04T22:24:00-08:00 2009-11-04T22:24:00-08:00 Added simple subversion support. 749bc41fd4a0565d9615f7a8e55d4aa6941e7522 Olivier Brisse ouranos@donarproject.org