hudson 0.3.0.beta.14 → 0.3.0.beta.15

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hudson (0.3.0.beta.14)
+    hudson (0.3.0.beta.15)
       builder (~> 2.1.2)
       hpricot
       httparty (~> 0.6.1)

data/features/step_definitions/hudson_steps.rb

@@ -3,6 +3,7 @@ Given /^I have a Hudson server running$/ do
     port = 3010
     begin
       res = Net::HTTP.start("localhost", port) { |http| http.get('/api/json') }
+      Hudson::Api.base_uri "http://localhost:#{port}"
     rescue Errno::ECONNREFUSED => e
       puts "\n\n\nERROR: To run tests, launch hudson in test mode: 'rake hudson:server:test'\n\n\n"
       exit
@@ -14,16 +15,10 @@ end
 
 Given /^the Hudson server has no current jobs$/ do
   if port = @hudson_port
-    require "open-uri"
-    require "yajl"
-    hudson_info = Yajl::Parser.new.parse(open("http://#{@hudson_host}:#{@hudson_port}/api/json"))
-
-    hudson_info['jobs'].each do |job|
-      job_url = job['url']
-      res = Net::HTTP.start("localhost", port) { |http| http.post("#{job_url}doDelete/api/json", {}) }
+    Hudson::Api.summary['jobs'].each do |job|
+      Hudson::Api.delete_job(job['name'])
     end
-    hudson_info = Yajl::Parser.new.parse(open("http://#{@hudson_host}:#{@hudson_port}/api/json"))
-    hudson_info['jobs'].should == []
+    Hudson::Api.summary['jobs'].should == []
   else
     puts "WARNING: Run 'I have a Hudson server running' step first."
   end
@@ -31,26 +26,16 @@ end
 
 Given /^the Hudson server has no slaves$/ do
   if port = @hudson_port
-    require "open-uri"
-    require "yajl"
-    base_url    = "http://#{@hudson_host}:#{@hudson_port}"
-    hudson_info = Yajl::Parser.new.parse(open("#{base_url}/api/json"))
-    (hudson_info['jobs'] || []).each do |job|
-      job_url = job['url']
-      res = Net::HTTP.start("localhost", port) { |http| http.post("#{job_url}doDelete/api/json", {}) }
+    Hudson::Api.summary['jobs'].each do |job|
+      Hudson::Api.delete_job(job['name'])
     end
-    hudson_info = Yajl::Parser.new.parse(open("#{base_url}/api/json"))
-    hudson_info['jobs'].should == []
+    Hudson::Api.summary['jobs'].should == []
 
-    hudson_info = Yajl::Parser.new.parse(open("#{base_url}/computer/api/json"))
-    hudson_info['computer'].each do |node|
-      name = node["displayName"]
-      next if name == "master"
-      job_url = "#{base_url}/computer/#{CGI::escape(name).gsub('+', '%20')}"
-      res = Net::HTTP.start("localhost", port) { |http| http.post("#{job_url}/doDelete/api/json", {}) }
+    Hudson::Api.nodes['computer'].each do |node|
+      name = node['displayName']
+      Hudson::Api.delete_node(name) unless name == "master"
     end
-    hudson_info = Yajl::Parser.new.parse(open("#{base_url}/computer/api/json"))
-    hudson_info['computer'].size.should == 1
+    Hudson::Api.nodes['computer'].size.should == 1
   else
     puts "WARNING: Run 'I have a Hudson server running' step first."
   end
@@ -91,8 +76,8 @@ end
 Then /^I should see a hudson server on port (\d+)$/ do |port|
   require 'json'
   try(15, 2) do
-    res = Net::HTTP.start("localhost", port) { |http| http.get('/api/json') }
-    JSON.parse(res.body)['nodeDescription'].should == "the master Hudson node"
+    Hudson::Api.base_uri "http://localhost:#{port}"
+    Hudson::Api.summary['nodeDescription'].should == "the master Hudson node"
   end
 end
 

data/hudson.gemspec

@@ -2,16 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hudson}
-  s.version = "0.3.0.beta.14"
+  s.version = "0.3.0.beta.15"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Charles Lowell", "Dr Nic Williams"]
-  s.date = %q{2010-11-01}
+  s.date = %q{2010-11-02}
   s.default_executable = %q{hudson}
   s.description = %q{A suite of utilities for bringing continous integration to your projects (not the other way around) with hudson CI}
   s.email = ["cowboyd@thefrontside.net", "drnicwilliams@gmail.com"]
   s.executables = ["hudson"]
-  s.files = ["bin", "bin/hudson", "features", "features/development.feature", "features/launch_server.feature", "features/listing_jobs.feature", "features/manage_jobs.feature", "features/manage_slave_nodes.feature", "features/step_definitions", "features/step_definitions/common_steps.rb", "features/step_definitions/fixture_project_steps.rb", "features/step_definitions/hudson_steps.rb", "features/step_definitions/scm_steps.rb", "features/support", "features/support/common.rb", "features/support/env.rb", "features/support/hooks.rb", "features/support/matchers.rb", "fixtures", "fixtures/projects", "fixtures/projects/non-bundler", "fixtures/projects/non-bundler/Rakefile", "fixtures/projects/rails-3", "fixtures/projects/rails-3/app", "fixtures/projects/rails-3/app/controllers", "fixtures/projects/rails-3/app/controllers/application_controller.rb", "fixtures/projects/rails-3/app/helpers", "fixtures/projects/rails-3/app/helpers/application_helper.rb", "fixtures/projects/rails-3/app/mailers", "fixtures/projects/rails-3/app/models", "fixtures/projects/rails-3/app/views", "fixtures/projects/rails-3/app/views/layouts", "fixtures/projects/rails-3/app/views/layouts/application.html.erb", "fixtures/projects/rails-3/config", "fixtures/projects/rails-3/config/application.rb", "fixtures/projects/rails-3/config/boot.rb", "fixtures/projects/rails-3/config/database.yml", "fixtures/projects/rails-3/config/environment.rb", "fixtures/projects/rails-3/config/environments", "fixtures/projects/rails-3/config/environments/development.rb", "fixtures/projects/rails-3/config/environments/production.rb", "fixtures/projects/rails-3/config/environments/test.rb", "fixtures/projects/rails-3/config/initializers", "fixtures/projects/rails-3/config/initializers/backtrace_silencers.rb", "fixtures/projects/rails-3/config/initializers/inflections.rb", "fixtures/projects/rails-3/config/initializers/mime_types.rb", "fixtures/projects/rails-3/config/initializers/secret_token.rb", "fixtures/projects/rails-3/config/initializers/session_store.rb", "fixtures/projects/rails-3/config/locales", "fixtures/projects/rails-3/config/locales/en.yml", "fixtures/projects/rails-3/config/routes.rb", "fixtures/projects/rails-3/config.ru", "fixtures/projects/rails-3/db", "fixtures/projects/rails-3/db/seeds.rb", "fixtures/projects/rails-3/doc", "fixtures/projects/rails-3/doc/README_FOR_APP", "fixtures/projects/rails-3/Gemfile", "fixtures/projects/rails-3/Gemfile.lock", "fixtures/projects/rails-3/lib", "fixtures/projects/rails-3/lib/tasks", "fixtures/projects/rails-3/log", "fixtures/projects/rails-3/log/development.log", "fixtures/projects/rails-3/log/production.log", "fixtures/projects/rails-3/log/server.log", "fixtures/projects/rails-3/log/test.log", "fixtures/projects/rails-3/public", "fixtures/projects/rails-3/public/404.html", "fixtures/projects/rails-3/public/422.html", "fixtures/projects/rails-3/public/500.html", "fixtures/projects/rails-3/public/favicon.ico", "fixtures/projects/rails-3/public/images", "fixtures/projects/rails-3/public/images/rails.png", "fixtures/projects/rails-3/public/index.html", "fixtures/projects/rails-3/public/javascripts", "fixtures/projects/rails-3/public/javascripts/application.js", "fixtures/projects/rails-3/public/javascripts/controls.js", "fixtures/projects/rails-3/public/javascripts/dragdrop.js", "fixtures/projects/rails-3/public/javascripts/effects.js", "fixtures/projects/rails-3/public/javascripts/prototype.js", "fixtures/projects/rails-3/public/javascripts/rails.js", "fixtures/projects/rails-3/public/robots.txt", "fixtures/projects/rails-3/public/stylesheets", "fixtures/projects/rails-3/Rakefile", "fixtures/projects/rails-3/README", "fixtures/projects/rails-3/script", "fixtures/projects/rails-3/script/rails", "fixtures/projects/rails-3/test", "fixtures/projects/rails-3/test/fixtures", "fixtures/projects/rails-3/test/functional", "fixtures/projects/rails-3/test/integration", "fixtures/projects/rails-3/test/performance", "fixtures/projects/rails-3/test/performance/browsing_test.rb", "fixtures/projects/rails-3/test/test_helper.rb", "fixtures/projects/rails-3/test/unit", "fixtures/projects/rails-3/vendor", "fixtures/projects/rails-3/vendor/plugins", "fixtures/projects/ruby", "fixtures/projects/ruby/Gemfile", "fixtures/projects/ruby/Gemfile.lock", "fixtures/projects/ruby/Rakefile", "Gemfile", "Gemfile.lock", "hudson.gemspec", "lib", "lib/hudson", "lib/hudson/api.rb", "lib/hudson/cli", "lib/hudson/cli/formatting.rb", "lib/hudson/cli.rb", "lib/hudson/config.rb", "lib/hudson/core_ext", "lib/hudson/core_ext/object", "lib/hudson/core_ext/object/blank.rb", "lib/hudson/hudson-cli.jar", "lib/hudson/hudson.war", "lib/hudson/hudson_version.rb", "lib/hudson/job_config_builder.rb", "lib/hudson/plugins", "lib/hudson/plugins/git.hpi", "lib/hudson/plugins/github.hpi", "lib/hudson/plugins/greenballs.hpi", "lib/hudson/plugins/rake.hpi", "lib/hudson/plugins/ruby.hpi", "lib/hudson/project_scm.rb", "lib/hudson/remote.rb", "lib/hudson/version.rb", "lib/hudson.rb", "Rakefile", "README.md", "spec", "spec/fixtures", "spec/fixtures/ec2_global.config.xml", "spec/fixtures/rails.multi.config.xml", "spec/fixtures/rails.single.config.triggers.xml", "spec/fixtures/rails.single.config.xml", "spec/fixtures/rubygem.config.xml", "spec/fixtures/therubyracer.config.xml", "spec/job_config_builder_spec.rb", "spec/spec_helper.rb", "tasks", "tasks/upgrade.rake"]
+  s.files = ["bin", "bin/hudson", "features", "features/development.feature", "features/launch_server.feature", "features/listing_jobs.feature", "features/manage_jobs.feature", "features/manage_slave_nodes.feature", "features/step_definitions", "features/step_definitions/common_steps.rb", "features/step_definitions/fixture_project_steps.rb", "features/step_definitions/hudson_steps.rb", "features/step_definitions/scm_steps.rb", "features/support", "features/support/common.rb", "features/support/env.rb", "features/support/hooks.rb", "features/support/matchers.rb", "fixtures", "fixtures/projects", "fixtures/projects/non-bundler", "fixtures/projects/non-bundler/Rakefile", "fixtures/projects/rails-3", "fixtures/projects/rails-3/app", "fixtures/projects/rails-3/app/controllers", "fixtures/projects/rails-3/app/controllers/application_controller.rb", "fixtures/projects/rails-3/app/helpers", "fixtures/projects/rails-3/app/helpers/application_helper.rb", "fixtures/projects/rails-3/app/mailers", "fixtures/projects/rails-3/app/models", "fixtures/projects/rails-3/app/views", "fixtures/projects/rails-3/app/views/layouts", "fixtures/projects/rails-3/app/views/layouts/application.html.erb", "fixtures/projects/rails-3/config", "fixtures/projects/rails-3/config/application.rb", "fixtures/projects/rails-3/config/boot.rb", "fixtures/projects/rails-3/config/database.yml", "fixtures/projects/rails-3/config/environment.rb", "fixtures/projects/rails-3/config/environments", "fixtures/projects/rails-3/config/environments/development.rb", "fixtures/projects/rails-3/config/environments/production.rb", "fixtures/projects/rails-3/config/environments/test.rb", "fixtures/projects/rails-3/config/initializers", "fixtures/projects/rails-3/config/initializers/backtrace_silencers.rb", "fixtures/projects/rails-3/config/initializers/inflections.rb", "fixtures/projects/rails-3/config/initializers/mime_types.rb", "fixtures/projects/rails-3/config/initializers/secret_token.rb", "fixtures/projects/rails-3/config/initializers/session_store.rb", "fixtures/projects/rails-3/config/locales", "fixtures/projects/rails-3/config/locales/en.yml", "fixtures/projects/rails-3/config/routes.rb", "fixtures/projects/rails-3/config.ru", "fixtures/projects/rails-3/db", "fixtures/projects/rails-3/db/seeds.rb", "fixtures/projects/rails-3/doc", "fixtures/projects/rails-3/doc/README_FOR_APP", "fixtures/projects/rails-3/Gemfile", "fixtures/projects/rails-3/Gemfile.lock", "fixtures/projects/rails-3/lib", "fixtures/projects/rails-3/lib/tasks", "fixtures/projects/rails-3/log", "fixtures/projects/rails-3/log/development.log", "fixtures/projects/rails-3/log/production.log", "fixtures/projects/rails-3/log/server.log", "fixtures/projects/rails-3/log/test.log", "fixtures/projects/rails-3/public", "fixtures/projects/rails-3/public/404.html", "fixtures/projects/rails-3/public/422.html", "fixtures/projects/rails-3/public/500.html", "fixtures/projects/rails-3/public/favicon.ico", "fixtures/projects/rails-3/public/images", "fixtures/projects/rails-3/public/images/rails.png", "fixtures/projects/rails-3/public/index.html", "fixtures/projects/rails-3/public/javascripts", "fixtures/projects/rails-3/public/javascripts/application.js", "fixtures/projects/rails-3/public/javascripts/controls.js", "fixtures/projects/rails-3/public/javascripts/dragdrop.js", "fixtures/projects/rails-3/public/javascripts/effects.js", "fixtures/projects/rails-3/public/javascripts/prototype.js", "fixtures/projects/rails-3/public/javascripts/rails.js", "fixtures/projects/rails-3/public/robots.txt", "fixtures/projects/rails-3/public/stylesheets", "fixtures/projects/rails-3/Rakefile", "fixtures/projects/rails-3/README", "fixtures/projects/rails-3/script", "fixtures/projects/rails-3/script/rails", "fixtures/projects/rails-3/test", "fixtures/projects/rails-3/test/fixtures", "fixtures/projects/rails-3/test/functional", "fixtures/projects/rails-3/test/integration", "fixtures/projects/rails-3/test/performance", "fixtures/projects/rails-3/test/performance/browsing_test.rb", "fixtures/projects/rails-3/test/test_helper.rb", "fixtures/projects/rails-3/test/unit", "fixtures/projects/rails-3/vendor", "fixtures/projects/rails-3/vendor/plugins", "fixtures/projects/ruby", "fixtures/projects/ruby/Gemfile", "fixtures/projects/ruby/Gemfile.lock", "fixtures/projects/ruby/Rakefile", "Gemfile", "Gemfile.lock", "hudson.gemspec", "lib", "lib/hudson", "lib/hudson/api.rb", "lib/hudson/cli", "lib/hudson/cli/formatting.rb", "lib/hudson/cli.rb", "lib/hudson/config.rb", "lib/hudson/core_ext", "lib/hudson/core_ext/object", "lib/hudson/core_ext/object/blank.rb", "lib/hudson/hudson-cli.jar", "lib/hudson/hudson.war", "lib/hudson/hudson_version.rb", "lib/hudson/job_config_builder.rb", "lib/hudson/plugins", "lib/hudson/plugins/git.hpi", "lib/hudson/plugins/github.hpi", "lib/hudson/plugins/greenballs.hpi", "lib/hudson/plugins/rake.hpi", "lib/hudson/plugins/ruby.hpi", "lib/hudson/project_scm.rb", "lib/hudson/remote.rb", "lib/hudson/version.rb", "lib/hudson.rb", "Rakefile", "README.md", "spec", "spec/fixtures", "spec/fixtures/ec2_global.config.xml", "spec/fixtures/rails.multi.config.xml", "spec/fixtures/rails.single.config.triggers.xml", "spec/fixtures/rails.single.config.xml", "spec/fixtures/ruby.single.config.xml", "spec/fixtures/rubygem.config.xml", "spec/fixtures/therubyracer.config.xml", "spec/job_config_builder_spec.rb", "spec/spec_helper.rb", "tasks", "tasks/upgrade.rake"]
   s.homepage = %q{http://github.com/cowboyd/hudson.rb}
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{hudson}

data/lib/hudson/api.rb

@@ -155,12 +155,18 @@ module Hudson
         false
       end
     end
+    
+    def self.delete_node(name)
+      post_plain("#{base_uri}/computer/#{CGI::escape(name).gsub('+', '%20')}/doDelete/api/json")
+    end
 
+    # Helper for POST that don't barf at Hudson's crappy API responses
     def self.post_plain(path, options = {})
       uri = URI.parse base_uri
       res = Net::HTTP.start(uri.host, uri.port) { |http| http.post(path, options) }
     end
     
+    # Helper for GET that don't barf at Hudson's crappy API responses
     def self.get_plain(path, options = {})
       uri = URI.parse base_uri
       res = Net::HTTP.start(uri.host, uri.port) { |http| http.get(path, options) }

data/lib/hudson/job_config_builder.rb

@@ -2,18 +2,23 @@ require "builder"
 
 module Hudson
   class JobConfigBuilder
-    attr_accessor :scm, :git_branches, :public_scm
     attr_accessor :job_type, :matrix_project
+    attr_accessor :steps
+    attr_accessor :scm, :public_scm, :git_branches, :git_tool
     attr_accessor :assigned_node
     
     InvalidTemplate = Class.new(StandardError)
     
-    def initialize(options = nil, &block)
-      if options.is_a?(String) || options.is_a?(Symbol)
-        self.job_type = options.to_s
-      elsif options.is_a?(Hash)
-        self.job_type = options[:job_type].to_s
-      end
+    # +job_type+ - template of default steps to create with the job
+    # +steps+ - array of [:method, cmd], e.g. [:build_shell_step, "bundle initial"]
+    #   - Default is based on +job_type+.
+    # +scm+           - URL to the repository. Currently only support git URLs.
+    # +public_scm+    - convert the +scm+ URL to a publicly accessible URL for the Hudson job config.
+    # +git_branches+  - array of branches to run builds. Default: ['master']
+    # +git_tool+      - key reference for Hudson CI git command. Default: 'Default'
+    # +assigned_node+ - restrict this job to running on slaves with these labels (space separated)
+    def initialize(job_type = :ruby, &block)
+      self.job_type = job_type.to_s if job_type
       
       yield self
 
@@ -95,7 +100,7 @@ module Hudson
           b.clean false
           b.wipeOutWorkspace false
           b.buildChooser :class => "hudson.plugins.git.util.DefaultBuildChooser"
-          b.gitTool "Default"
+          b.gitTool git_tool ? git_tool : "Default"
           b.submoduleCfg :class => "list"
           b.relativeTargetDir
           b.excludedRegions
@@ -128,22 +133,29 @@ module Hudson
     VALID_JOB_TEMPLATES = %w[rails rails3 ruby rubygem]
     def build_steps(b)
       b.builders do
-        raise InvalidTemplate unless VALID_JOB_TEMPLATES.include?(job_type)
-        if job_type == "rails" || job_type == "rails3"
-          build_shell_step b, "bundle install"
-          build_ruby_step b, <<-RUBY.gsub(/^          /, '')
-          unless File.exist?("config/database.yml")
-            require 'fileutils'
-            example = Dir["config/database*"].first
-            puts "Using \#{example} for config/database.yml"
-            FileUtils.cp example, "config/database.yml"
+        if job_type
+          raise InvalidTemplate unless VALID_JOB_TEMPLATES.include?(job_type)
+          if job_type == "rails" || job_type == "rails3"
+            build_shell_step b, "bundle install"
+            build_ruby_step b, <<-RUBY.gsub(/^            /, '')
+            unless File.exist?("config/database.yml")
+              require 'fileutils'
+              example = Dir["config/database*"].first
+              puts "Using \#{example} for config/database.yml"
+              FileUtils.cp example, "config/database.yml"
+            end
+            RUBY
+            build_shell_step b, "bundle exec rake db:schema:load"
+            build_shell_step b, "bundle exec rake"
+          else
+            build_shell_step b, "bundle install"
+            build_shell_step b, "bundle exec rake"
           end
-          RUBY
-          build_shell_step b, "bundle exec rake db:schema:load"
-          build_shell_step b, "bundle exec rake"
         else
-          build_shell_step b, "bundle install"
-          build_shell_step b, "bundle exec rake"
+          steps.each do |step|
+            method, cmd = step
+            send(method.to_sym, b, cmd)
+          end
         end
       end
     end

data/lib/hudson/version.rb

@@ -1,3 +1,3 @@
 module Hudson
-  VERSION = "0.3.0.beta.14"
+  VERSION = "0.3.0.beta.15"
 end

data/spec/fixtures/ruby.single.config.xml

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <actions/>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties/>
+  <scm class="hudson.plugins.git.GitSCM">
+    <configVersion>1</configVersion>
+    <remoteRepositories>
+      <org.spearce.jgit.transport.RemoteConfig>
+        <string>origin</string>
+        <int>5</int>
+        <string>fetch</string>
+        <string>+refs/heads/*:refs/remotes/origin/*</string>
+        <string>receivepack</string>
+        <string>git-upload-pack</string>
+        <string>uploadpack</string>
+        <string>git-upload-pack</string>
+        <string>url</string>
+        <string>git://codebasehq.com/mocra/misc/mocra-web.git</string>
+        <string>tagopt</string>
+        <string/>
+      </org.spearce.jgit.transport.RemoteConfig>
+    </remoteRepositories>
+    <branches>
+      <hudson.plugins.git.BranchSpec>
+        <name>master</name>
+      </hudson.plugins.git.BranchSpec>
+    </branches>
+    <localBranch/>
+    <mergeOptions/>
+    <recursiveSubmodules>false</recursiveSubmodules>
+    <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+    <authorOrCommitter>false</authorOrCommitter>
+    <clean>false</clean>
+    <wipeOutWorkspace>false</wipeOutWorkspace>
+    <buildChooser class="hudson.plugins.git.util.DefaultBuildChooser"/>
+    <gitTool>Default</gitTool>
+    <submoduleCfg class="list"/>
+    <relativeTargetDir/>
+    <excludedRegions/>
+    <excludedUsers/>
+  </scm>
+  <canRoam>true</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <concurrentBuild>false</concurrentBuild>
+  <builders>
+    <hudson.tasks.Shell>
+      <command>bundle install</command>
+    </hudson.tasks.Shell>
+    <hudson.tasks.Shell>
+      <command>bundle exec rake</command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers/>
+  <buildWrappers/>
+</project>

data/spec/job_config_builder_spec.rb

@@ -3,11 +3,26 @@ require File.dirname(__FILE__) + "/spec_helper"
 describe Hudson::JobConfigBuilder do
   include ConfigFixtureLoaders
   
-  describe "rails job; single axis; block syntax" do
+  describe "explicit steps to match a ruby job" do
+    before do
+      @config = Hudson::JobConfigBuilder.new do |c|
+        c.scm = "git://codebasehq.com/mocra/misc/mocra-web.git"
+        c.steps = [
+          [:build_shell_step, "bundle install"],
+          [:build_shell_step, "bundle exec rake"]
+        ]
+      end
+    end
+    it "builds config.xml" do
+      config_xml("ruby", "single").should == @config.to_xml
+    end
+  end
+  
+  
+  describe "rails job; single axis" do
     before do
       @config = Hudson::JobConfigBuilder.new(:rails) do |c|
         c.scm = "git://codebasehq.com/mocra/misc/mocra-web.git"
-        c.git_branches = %w[master]
       end
     end
     it "builds config.xml" do
@@ -15,7 +30,9 @@ describe Hudson::JobConfigBuilder do
     end
   end
   
-  describe "rubygem job; single axis; block syntax" do
+  
+  
+  describe "rubygem job; single axis" do
     before do
       @config = Hudson::JobConfigBuilder.new(:rubygem) do |c|
         c.scm = "http://github.com/drnic/picasa_plucker.git"
@@ -53,7 +70,6 @@ describe Hudson::JobConfigBuilder do
     before do
       @config = Hudson::JobConfigBuilder.new(:rails) do |c|
         c.scm = "git@codebasehq.com:mocra/misc/mocra-web.git"
-        c.git_branches = %w[master]
         c.public_scm = true
       end
     end
@@ -62,4 +78,17 @@ describe Hudson::JobConfigBuilder do
     end
   end
 
+  describe "select specific git cmd" do
+    before do
+      @config = Hudson::JobConfigBuilder.new(:rails) do |c|
+        c.scm      = "git://codebasehq.com/mocra/misc/mocra-web.git"
+        c.git_tool = "xyz"
+        c.steps    = []
+      end
+    end
+    it "builds config.xml" do
+      Hpricot.XML(@config.to_xml).search("gitTool").size.should == 1
+      Hpricot.XML(@config.to_xml).search("gitTool").text.should == "xyz"
+    end
+  end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: hudson
 version: !ruby/object:Gem::Version 
-  hash: 62196367
+  hash: 62196365
   prerelease: true
   segments: 
   - 0
   - 3
   - 0
   - beta
-  - 14
-  version: 0.3.0.beta.14
+  - 15
+  version: 0.3.0.beta.15
 platform: ruby
 authors: 
 - Charles Lowell
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-01 00:00:00 -07:00
+date: 2010-11-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -293,6 +293,7 @@ files:
 - spec/fixtures/rails.multi.config.xml
 - spec/fixtures/rails.single.config.triggers.xml
 - spec/fixtures/rails.single.config.xml
+- spec/fixtures/ruby.single.config.xml
 - spec/fixtures/rubygem.config.xml
 - spec/fixtures/therubyracer.config.xml
 - spec/job_config_builder_spec.rb