.gitignore lib/git.rb @@ -6,7 +6,6 @@ class ChangeInSourceControlTrigger def build_necessary?(reasons) p = @triggered_project p.notify :polling_source_control - if !p.source_control.up_to_date?(reasons) p.notify :new_revisions_detected, reasons.flatten.find_all{|reason| reason.is_a? Revision} return true app/models/change_in_source_control_trigger.rb @@ -8,7 +8,7 @@ class Project end def self.read(dir, load_config = true) - @project_in_the_works = Project.new(File.basename(dir)) + @project_in_the_works = Project.new(File.basename(dir), File.exists?("#{dir}/work/.git") ? Git.new : Subversion.new) begin @project_in_the_works.load_config if load_config return @project_in_the_works app/models/project.rb @@ -10,16 +10,26 @@ trace = false scm_options = {:interactive => true} ARGV.options do |opts| - opts.banner = "usage: cruise add <project-name> --url <URL> [subversion options]" + opts.banner = "usage: cruise add <project-name> --svn-url <URL> [subversion options]" + opts.banner << "\n cruise add <project-name> --git-url <URL> [git options]" opts.separator "" - opts.on("-u", "--url url", String, + opts.on("-s", "--svn-url url", String, "The subversion url for the project (eg. svn://rubyforge.org/var/svn/cruisecontrolrb)") do |v| scm_options[:url] = v + scm_options[:svn] = true end + + opts.on("-g", "--git-url url", String, + "The git url for the project (eg. git://github.com/benburkert/cruisecontrolrb.git)") do |v| + scm_options[:url] = v + scm_options[:git] = true + end + opts.on("--username username", String, "Specify a username for source control") { |v| scm_options[:username] = v } opts.on("--password password", String, "Specify a password for source control") { |v| scm_options[:password] = v } + opts.on("-b", "--branch", String, "Specify a branch to track(git only)") { |v| scm_options[:branch] = v} opts.on('-t', '--trace', 'Print out exception stack traces') { trace = true } opts.separator "" @@ -47,14 +57,21 @@ end puts "Adding project '#{project_name}' (this may take a while)..." begin - require RAILS_ROOT + "/config/environment" - - source_control = Subversion.new(scm_options) - project = Project.new(project_name, source_control) - projects = Projects.load_all - projects << project - - if source_control.url =~ /^svn\+ssh\:\/\// + require RAILS_ROOT + "/config/environment" + + if scm_options.has_key?(:svn) + source_control = Subversion.new(scm_options) + elsif scm_options.has_key?(:git) + source_control = Git.new(scm_options) + else + raise "Unsupported SCM" + end + + project = Project.new(project_name, source_control) + projects = Projects.load_all + projects << project + + if source_control.url =~ /^svn\+ssh\:\/\// puts "IMPORTANT!!! - It looks like you are connecting to your repository with an svn+ssh connection. " + "For cruise to build this project, you need to have set up authentication caching for ssh, see this article" puts " http://subversion.tigris.org/faq.html#ssh-auth-cache" script/add_project @@ -9,7 +9,7 @@ require 'optparse' CRUISE_OPTIONS = { :verbose => false } ARGV.options do |opts| - opts.banner = "Usage: cruise builder <project_name> []options]" + opts.banner = "Usage: cruise builder <project_name> [options]" opts.separator "" script/builder c4efd1a65235f7989268f80409700dd409f8e71f Ben Burkert ben@benburkert.com http://github.com/benburkert/cruisecontrolrb/commit/2a51723432b357e3fc792a1d489a7c974c27289d 2a51723432b357e3fc792a1d489a7c974c27289d 2008-02-11T22:07:16-08:00 2008-02-11T22:07:16-08:00 Hacked together git support for cruisecontrolrb 79aab8c97f744de2f801fe4e3c3d0fb3a5ded1db Ben Burkert ben@benburkert.com