test/integration/adding_spec.rb test/integration_helper.rb @@ -1,47 +1,19 @@ -require 'singleton' require 'rubygems' require 'open4' module Braid module Operations class ShellExecutionError < BraidError - def initialize(err = nil) - @err = err - end - - def message - @err.to_s.split("\n").first - end - end - class VersionTooLow < BraidError - def initialize(command, version) - @command = command - @version = version.to_s.split("\n").first - end - - def message - "#{@command} version too low: #{@version}" - end end - class UnknownRevision < BraidError - def message - "unknown revision: #{super}" - end + class VersionError < BraidError end - class LocalChangesPresent < BraidError - def message - "local changes are present" - end - end - - # The command proxy is meant to encapsulate commands such as git, git-svn and svn, that work with subcommands. - class Proxy - include Singleton - - def self.command; name.split('::').last.downcase; end # hax! + # The command proxy is meant to encapsulate commands such as git, git svn and svn, that work with subcommands. + # + # It is expected that subclasses override the command method, define a COMMAND constant and have a VersionTooLow exception. + class CommandProxy def version - status, out, err = exec!("#{self.class.command} --version") + status, out, err = exec!("#{self.class::COMMAND} --version") out.sub(/^.* version/, "").strip end @@ -68,7 +40,7 @@ module Braid end def require_version!(required) - require_version(required) || raise(VersionTooLow.new(self.class.command, version)) + require_version(required) || raise(self.class::VersionTooLow, version) end private @@ -78,7 +50,7 @@ module Braid end def invoke(arg, *args) - exec!("#{command(arg)} #{args.join(' ')}".strip)[1].strip # return stdout + exec!("#{command(arg)} #{args.join(' ')}".strip)[1] # return stdout end def method_missing(name, *args) @@ -93,8 +65,8 @@ module Braid out, err = nil status = Open4.popen4(cmd) do |pid, stdin, stdout, stderr| - out = stdout.read - err = stderr.read + out = stdout.read.strip + err = stderr.read.strip end.exitstatus [status, out, err] @@ -109,9 +81,18 @@ module Braid end end - class Git < Proxy - def commit(message, *args) - status, out, err = exec("git commit -m #{message.inspect} --no-verify #{args.join(' ')}") + class Git < CommandProxy + COMMAND = "git" + + class UnknownRevision < BraidError + end + class LocalChangesPresent < BraidError + end + class VersionTooLow < VersionError + end + + def commit(message) + status, out, err = exec("git commit -m #{message.inspect} --no-verify") if status == 0 true @@ -125,7 +106,7 @@ module Braid def fetch(remote) # open4 messes with the pipes of index-pack system("git fetch -n #{remote} &> /dev/null") - raise ShellExecutionError, "could not fetch" unless $? == 0 + raise ShellExecutionError unless $? == 0 true end @@ -219,38 +200,40 @@ module Braid out[2..-1] end - def apply(diff, *args) - err = nil - status = Open4.popen4("git apply --index --whitespace=nowarn #{args.join(' ')} -") do |pid, stdin, stdout, stderr| + def apply(diff) + # always uses index + status = Open4.popen4("git apply --index -") do |pid, stdin, stdout, stderr| stdin.puts(diff) stdin.close - - err = stderr.read end.exitstatus - raise ShellExecutionError, err unless status == 0 + raise ShellExecutionError unless status == 0 true end private def command(name) - "#{self.class.command} #{name.to_s.gsub('_', '-')}" + "#{COMMAND} #{name.to_s.gsub('_', '-')}" end end - class GitSvn < Proxy - def self.command; "git svn"; end + class GitSvn < CommandProxy + COMMAND = "git svn" + + class UnknownRevision < BraidError + end + class VersionTooLow < VersionError + end def commit_hash(remote, revision) out = invoke(:log, "--show-commit --oneline", "-r #{revision}", remote) - part = out.to_s.split(" | ")[1] - raise UnknownRevision, "r#{revision}" unless part - Git.instance.rev_parse(part) # FIXME ugly ugly ugly + part = out.split(" | ")[1] + raise UnknownRevision, "unknown revision: #{revision}" unless part + Git.new.rev_parse(part) # FIXME ugly ugly ugly end def fetch(remote) # open4 messes with the pipes of index-pack system("git svn fetch #{remote} &> /dev/null") - raise ShellExecutionError, "could not fetch" unless $? == 0 true end @@ -261,11 +244,13 @@ module Braid private def command(name) - "#{self.class.command} #{name}" + "#{COMMAND} #{name}" end end - class Svn < Proxy + class Svn < CommandProxy + COMMAND = "svn" + def clean_revision(revision) revision.to_i if revision end @@ -279,17 +264,18 @@ module Braid end module VersionControl - def git - Git.instance - end + private + def git + Git.new + end - def git_svn - GitSvn.instance - end + def git_svn + GitSvn.new + end - def svn - Svn.instance - end + def svn + Svn.new + end end end end lib/braid/operations.rb 21b660817f14333304e51a67fb7f700a1b0f678c Cristi Balan evil@che.lu http://github.com/evilchelu/braid/commit/0d77e1e840c851b114595f5de968f92c82f7b3e1 0d77e1e840c851b114595f5de968f92c82f7b3e1 2008-08-19T11:06:47-07:00 2008-07-20T20:10:31-07:00 add adding integration specs and some crappy helpers eab53ec36bc4cc24c2373bcd52f1c2619cdd78d9 Cristi Balan evil@che.lu