hudson 0.3.0.beta.3 → 0.3.0.beta.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hudson (0.3.0.beta.2)
+    hudson (0.3.0.beta.3)
       builder (~> 2.1.2)
       hpricot
       httparty (~> 0.5.2)

data/Rakefile

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_dependency("hpricot")
   s.add_development_dependency("rake", ["~> 0.8.7"])
   s.add_development_dependency("cucumber", ["~> 0.9.0"])
-  s.add_development_dependency("rspec", ["~> 2.0.0.beta"])
+  s.add_development_dependency("rspec", ["~> 2.0.0"])
   s.add_development_dependency("json", ["~>1.4.0"])
   s.add_development_dependency("awesome_print")
 end

data/hudson.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hudson}
-  s.version = "0.3.0.beta.3"
+  s.version = "0.3.0.beta.4"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Charles Lowell", "Dr Nic Williams"]
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<hpricot>, [">= 0"])
       s.add_development_dependency(%q<rake>, ["~> 0.8.7"])
       s.add_development_dependency(%q<cucumber>, ["~> 0.9.0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.0.0.beta"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.0.0"])
       s.add_development_dependency(%q<json>, ["~> 1.4.0"])
       s.add_development_dependency(%q<awesome_print>, [">= 0"])
     else
@@ -43,7 +43,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<hpricot>, [">= 0"])
       s.add_dependency(%q<rake>, ["~> 0.8.7"])
       s.add_dependency(%q<cucumber>, ["~> 0.9.0"])
-      s.add_dependency(%q<rspec>, ["~> 2.0.0.beta"])
+      s.add_dependency(%q<rspec>, ["~> 2.0.0"])
       s.add_dependency(%q<json>, ["~> 1.4.0"])
       s.add_dependency(%q<awesome_print>, [">= 0"])
     end
@@ -56,7 +56,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<hpricot>, [">= 0"])
     s.add_dependency(%q<rake>, ["~> 0.8.7"])
     s.add_dependency(%q<cucumber>, ["~> 0.9.0"])
-    s.add_dependency(%q<rspec>, ["~> 2.0.0.beta"])
+    s.add_dependency(%q<rspec>, ["~> 2.0.0"])
     s.add_dependency(%q<json>, ["~> 1.4.0"])
     s.add_dependency(%q<awesome_print>, [">= 0"])
   end

data/lib/hudson.rb

@@ -1,5 +1,5 @@
 module Hudson
-  VERSION        = "0.3.0.beta.3"
+  VERSION        = "0.3.0.beta.4"
   HUDSON_VERSION = "1.380"
   WAR            = File.expand_path(File.dirname(__FILE__) + "/hudson/hudson.war")
   PLUGINS        = File.expand_path(File.dirname(__FILE__) + "/hudson/plugins")

data/lib/hudson/api.rb

@@ -3,6 +3,8 @@ require 'cgi'
 require 'uri'
 require 'json'
 
+require 'hudson/config'
+
 module Hudson
   module Api
     include HTTParty
@@ -73,7 +75,7 @@ module Hudson
       default_options = Hash.new("")
       default_options.merge!(
         :slave_port  => 22,
-        :master_key  => "/home/hudson/.ssh/hudson",
+        :master_key  => "/home/hudson/.ssh/id_rsa", # FIXME - hardcoded master username assumption
         :remote_fs   => "/data/hudson-slave/",
         :description => "Automatically created by Hudson.rb",
         :executors   => 2,

data/lib/hudson/cli.rb

@@ -1,7 +1,6 @@
 require 'thor'
 require 'hudson/core_ext/object/blank'
 require 'hudson/cli/formatting'
-require 'hudson/config'
 require 'hudson/remote'
 
 module Hudson

data/lib/hudson/job_config_builder.rb

@@ -4,6 +4,7 @@ module Hudson
   class JobConfigBuilder
     attr_accessor :scm, :git_branches
     attr_accessor :job_type, :matrix_project
+    attr_accessor :assigned_node
   
     def initialize(options = nil, &block)
       if options.is_a?(Symbol)
@@ -25,6 +26,7 @@ module Hudson
         b.keepDependencies false
         b.properties
         build_scm b
+        b.assignedNode assigned_node if assigned_node
         b.canRoam true
         b.disabled false
         b.blockBuildWhenUpstreamBuilding false
@@ -106,7 +108,7 @@ module Hudson
     def build_steps(b)
       b.builders do
         if job_type == "rails"
-          build_ruby_step b, <<-RUBY.gsub(/^      /, '')
+          build_ruby_step b, <<-RUBY.gsub(/^          /, '')
           unless File.exist?("config/database.yml")
             require 'fileutils'
             example = Dir["config/database*"].first
@@ -133,7 +135,9 @@ module Hudson
     # </hudson.plugins.ruby.Ruby>
     def build_ruby_step(b, command)
       b.tag! "hudson.plugins.ruby.Ruby" do
-        b.command command
+        b.command do
+          b << command.to_xs.gsub(%r{"}, '&quot;').gsub(%r{'}, '&apos;')
+        end
       end
     end
   

data/spec/fixtures/rails.multi.config.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <matrix-project>
   <actions/>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties/>
   <scm class="hudson.plugins.git.GitSCM">
@@ -19,7 +19,7 @@
         <string>url</string>
         <string>git@codebasehq.com:mocra/dash/web-app.git</string>
         <string>tagopt</string>
-        <string></string>
+        <string/>
       </org.spearce.jgit.transport.RemoteConfig>
     </remoteRepositories>
     <branches>
@@ -59,25 +59,25 @@ end</command>
     </hudson.plugins.ruby.Ruby>
     <hudson.plugins.rake.Rake>
       <rakeInstallation>(Default)</rakeInstallation>
-      <rakeFile></rakeFile>
-      <rakeLibDir></rakeLibDir>
-      <rakeWorkingDir></rakeWorkingDir>
+      <rakeFile/>
+      <rakeLibDir/>
+      <rakeWorkingDir/>
       <tasks>db:schema:load</tasks>
       <silent>false</silent>
     </hudson.plugins.rake.Rake>
     <hudson.plugins.rake.Rake>
       <rakeInstallation>(Default)</rakeInstallation>
-      <rakeFile></rakeFile>
-      <rakeLibDir></rakeLibDir>
-      <rakeWorkingDir></rakeWorkingDir>
+      <rakeFile/>
+      <rakeLibDir/>
+      <rakeWorkingDir/>
       <tasks>features</tasks>
       <silent>false</silent>
     </hudson.plugins.rake.Rake>
     <hudson.plugins.rake.Rake>
       <rakeInstallation>(Default)</rakeInstallation>
-      <rakeFile></rakeFile>
-      <rakeLibDir></rakeLibDir>
-      <rakeWorkingDir></rakeWorkingDir>
+      <rakeFile/>
+      <rakeLibDir/>
+      <rakeWorkingDir/>
       <tasks>spec</tasks>
       <silent>false</silent>
     </hudson.plugins.rake.Rake>

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

@@ -45,38 +45,40 @@
   <concurrentBuild>false</concurrentBuild>
   <builders>
     <hudson.plugins.ruby.Ruby>
-      <command>unless File.exist?(&quot;config/database.yml&quot;)
+      <command>
+unless File.exist?(&quot;config/database.yml&quot;)
   require &apos;fileutils&apos;
   example = Dir[&quot;config/database*&quot;].first
   puts &quot;Using #{example} for config/database.yml&quot;
   FileUtils.cp example, &quot;config/database.yml&quot;
-end</command>
+end
+      </command>
     </hudson.plugins.ruby.Ruby>
     <hudson.plugins.rake.Rake>
       <rakeInstallation>(Default)</rakeInstallation>
-      <rakeFile></rakeFile>
-      <rakeLibDir></rakeLibDir>
-      <rakeWorkingDir></rakeWorkingDir>
+      <rakeFile/>
+      <rakeLibDir/>
+      <rakeWorkingDir/>
       <tasks>db:schema:load</tasks>
       <silent>false</silent>
     </hudson.plugins.rake.Rake>
     <hudson.plugins.rake.Rake>
       <rakeInstallation>(Default)</rakeInstallation>
-      <rakeFile></rakeFile>
-      <rakeLibDir></rakeLibDir>
-      <rakeWorkingDir></rakeWorkingDir>
+      <rakeFile/>
+      <rakeLibDir/>
+      <rakeWorkingDir/>
       <tasks>features</tasks>
       <silent>false</silent>
     </hudson.plugins.rake.Rake>
     <hudson.plugins.rake.Rake>
       <rakeInstallation>(Default)</rakeInstallation>
-      <rakeFile></rakeFile>
-      <rakeLibDir></rakeLibDir>
-      <rakeWorkingDir></rakeWorkingDir>
+      <rakeFile/>
+      <rakeLibDir/>
+      <rakeWorkingDir/>
       <tasks>spec</tasks>
       <silent>false</silent>
     </hudson.plugins.rake.Rake>
   </builders>
   <publishers/>
   <buildWrappers/>
-</project>
+</project>

data/spec/job_config_builder_spec.rb

@@ -15,7 +15,7 @@ describe Hudson::JobConfigBuilder do
       config_xml.should == @config.to_xml
     end
   end
-
+  
   describe "rubygem job; single axis; block syntax" do
     before do
       @config = Hudson::JobConfigBuilder.new(:rubygem) do |c|
@@ -27,4 +27,26 @@ describe Hudson::JobConfigBuilder do
       config_xml.should == @config.to_xml
     end
   end
+  
+  describe "assigned slave nodes for slave usage" do
+    before do
+      @config = Hudson::JobConfigBuilder.new(:rails) do |c|
+        c.assigned_node = "my-slave"
+      end
+    end
+    it "builds config.xml" do
+      Hpricot.XML(@config.to_xml).search("assignedNode").size.should == 1
+      Hpricot.XML(@config.to_xml).search("assignedNode").text.should == "my-slave"
+    end
+  end
+  
+  describe "no specific slave nodes" do
+    before do
+      @config = Hudson::JobConfigBuilder.new(:rails) do |c|
+      end
+    end
+    it "builds config.xml" do
+      Hpricot.XML(@config.to_xml).search("assignedNode").size.should == 0
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,13 +1,9 @@
-begin
-  require 'rspec'
-rescue LoadError
-  require 'rubygems' unless ENV['NO_RUBYGEMS']
-  gem 'rspec'
-  require 'rspec'
-end
+require "bundler"
+Bundler.setup
 
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 require 'hudson'
+require 'hpricot'
 
 module ConfigFixtureLoaders
   def config_xml(name, variation = nil)

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: hudson
 version: !ruby/object:Gem::Version 
-  hash: 62196373
+  hash: 62196379
   prerelease: true
   segments: 
   - 0
   - 3
   - 0
   - beta
-  - 3
-  version: 0.3.0.beta.3
+  - 4
+  version: 0.3.0.beta.4
 platform: ruby
 authors: 
 - Charles Lowell
@@ -153,13 +153,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31098209
+        hash: 15
         segments: 
         - 2
         - 0
         - 0
-        - beta
-        version: 2.0.0.beta
+        version: 2.0.0
   type: :development
   prerelease: false
   name: rspec