hudson 0.3.1 → 0.5.0

data/lib/hudson/project_scm.rb

@@ -1,8 +1,8 @@
 module Hudson
   class ProjectScm
   
-    def self.discover
-      ProjectScmGit.new if File.exist?(".git") && File.directory?(".git")
+    def self.discover(scm)
+      ProjectScmGit.new(scm) if File.exist?(".git") && File.directory?(".git")
     end
   
     def self.supported
@@ -12,7 +12,7 @@ module Hudson
 
   class ProjectScmGit < ProjectScm
     def initialize(url = nil)
-      @url = nil
+      @url = url
     end
   
     def url

data/lib/hudson/version.rb

@@ -1,3 +1,3 @@
 module Hudson
-  VERSION = "0.3.1"
+  VERSION = "0.5.0"
 end

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

@@ -44,6 +44,7 @@
   <canRoam>true</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers class="vector"/>
   <concurrentBuild>false</concurrentBuild>
   <builders>
     <hudson.tasks.Shell>

data/spec/fixtures/ruby.multi-ruby-multi-labels.config.xml

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<matrix-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>http://github.com/drnic/picasa_plucker.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>
+  <triggers class="vector"/>
+  <concurrentBuild>false</concurrentBuild>
+  <axes>
+    <hudson.matrix.TextAxis>
+      <name>RUBY_VERSION</name>
+      <values>
+        <string>1.8.7</string>
+        <string>1.9.2</string>
+        <string>rbx-head</string>
+        <string>jruby</string>
+      </values>
+    </hudson.matrix.TextAxis>
+    <hudson.matrix.LabelAxis>
+      <name>label</name>
+      <values>
+        <string>1.8.7</string>
+        <string>ubuntu</string>
+      </values>
+    </hudson.matrix.LabelAxis>
+  </axes>
+  <builders>
+    <hudson.tasks.Shell>
+      <command>rvm $RUBY_VERSION</command>
+    </hudson.tasks.Shell>
+    <hudson.tasks.Shell>
+      <command>rvm gemset create ruby-$RUBY_VERSION &amp;&amp; rvm gemset use ruby-$RUBY_VERSION</command>
+    </hudson.tasks.Shell>
+    <hudson.tasks.Shell>
+      <command>bundle install</command>
+    </hudson.tasks.Shell>
+    <hudson.tasks.Shell>
+      <command>bundle exec rake</command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers/>
+  <buildWrappers/>
+  <runSequentially>false</runSequentially>
+</matrix-project>

data/spec/fixtures/{rubygem.config.xml → ruby.multi.config.xml}

@@ -44,9 +44,26 @@
   <canRoam>true</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers class="vector"/>
   <concurrentBuild>false</concurrentBuild>
-  <axes/>
+  <axes>
+    <hudson.matrix.TextAxis>
+      <name>RUBY_VERSION</name>
+      <values>
+        <string>1.8.7</string>
+        <string>1.9.2</string>
+        <string>rbx-head</string>
+        <string>jruby</string>
+      </values>
+    </hudson.matrix.TextAxis>
+  </axes>
   <builders>
+    <hudson.tasks.Shell>
+      <command>rvm $RUBY_VERSION</command>
+    </hudson.tasks.Shell>
+    <hudson.tasks.Shell>
+      <command>rvm gemset create ruby-$RUBY_VERSION &amp;&amp; rvm gemset use ruby-$RUBY_VERSION</command>
+    </hudson.tasks.Shell>
     <hudson.tasks.Shell>
       <command>bundle install</command>
     </hudson.tasks.Shell>

data/spec/job_config_builder_spec.rb

@@ -33,14 +33,20 @@ describe Hudson::JobConfigBuilder do
   
   
   
-  describe "rubygem job; single axis" do
+  describe "many rubies" do
     before do
-      @config = Hudson::JobConfigBuilder.new(:rubygem) do |c|
+      @config = Hudson::JobConfigBuilder.new(:ruby) do |c|
         c.scm = "http://github.com/drnic/picasa_plucker.git"
+        c.rubies = %w[1.8.7 1.9.2 rbx-head jruby]
       end
     end
-    it "builds config.xml" do
-      config_xml("rubygem").should == @config.to_xml
+    it "have have explicit rubies" do
+      config_xml("ruby", "multi").should == @config.to_xml
+    end
+    
+    it "and many labels/assigned_nodes" do
+      @config.node_labels = %w[1.8.7 ubuntu]
+      config_xml("ruby", "multi-ruby-multi-labels").should == @config.to_xml
     end
   end
   
@@ -67,15 +73,45 @@ describe Hudson::JobConfigBuilder do
     end
   end
   
-  describe "public_scm = true => convert git@ into git:// until we have deploy keys" do
-    before do
-      @config = Hudson::JobConfigBuilder.new(:rails) do |c|
-        c.scm = "git@codebasehq.com:mocra/misc/mocra-web.git"
-        c.public_scm = true
+  describe "SCM behaviour" do
+    describe "#public_scm = true => convert git@ into git:// until we have deploy keys" do
+      before do
+        @config = Hudson::JobConfigBuilder.new(:rails) do |c|
+          c.scm = "git@codebasehq.com:mocra/misc/mocra-web.git"
+          c.public_scm = true
+        end
+      end
+      it "builds config.xml" do
+        config_xml("rails", "single").should == @config.to_xml
       end
     end
-    it "builds config.xml" do
-      config_xml("rails", "single").should == @config.to_xml
+    
+    # <branches>
+    #   <hudson.plugins.git.BranchSpec>
+    #     <name>master</name>
+    #   </hudson.plugins.git.BranchSpec>
+    #   <hudson.plugins.git.BranchSpec>
+    #     <name>other</name>
+    #   </hudson.plugins.git.BranchSpec>
+    # </branches>
+    describe "#scm-branches - set branches" do
+      before do
+        @config = Hudson::JobConfigBuilder.new(:rails) do |c|
+          c.scm = "git@codebasehq.com:mocra/misc/mocra-web.git"
+        end
+      end
+      it "defaults to 'master'" do
+        branch_names = Hpricot.XML(@config.to_xml).search("branches name")
+        branch_names.size.should == 1
+        branch_names.text.should == "master"
+        branch_names.first.parent.name.should == "hudson.plugins.git.BranchSpec"
+      end
+      it "can have specific branches" do
+        branches = @config.scm_branches = %w[master other branches]
+        branch_names = Hpricot.XML(@config.to_xml).search("branches name")
+        branch_names.size.should == 3
+        branch_names.map(&:inner_text).should == branches
+      end
     end
   end
 

metadata

@@ -1,25 +1,27 @@
 --- !ruby/object:Gem::Specification 
 name: hudson
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 11
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 1
-  version: 0.3.1
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Charles Lowell
-- Dr Nic Williams
+- Nic Williams
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-11-08 00:00:00 -08:00
+date: 2010-12-01 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: term-ansicolor
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -32,10 +34,10 @@ dependencies:
         - 4
         version: 1.0.4
   type: :runtime
-  prerelease: false
-  name: term-ansicolor
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
+  name: yajl-ruby
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -48,10 +50,10 @@ dependencies:
         - 6
         version: 0.7.6
   type: :runtime
-  prerelease: false
-  name: yajl-ruby
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
+  name: httparty
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -64,10 +66,10 @@ dependencies:
         - 1
         version: 0.6.1
   type: :runtime
-  prerelease: false
-  name: httparty
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
+  name: builder
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -80,10 +82,10 @@ dependencies:
         - 2
         version: 2.1.2
   type: :runtime
-  prerelease: false
-  name: builder
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
+  name: thor
+  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -96,10 +98,10 @@ dependencies:
         - 2
         version: 0.14.2
   type: :runtime
-  prerelease: false
-  name: thor
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
+  name: hpricot
+  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -110,10 +112,10 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  prerelease: false
-  name: hpricot
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -126,10 +128,10 @@ dependencies:
         - 7
         version: 0.8.7
   type: :development
-  prerelease: false
-  name: rake
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
+  name: cucumber
+  prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -142,10 +144,10 @@ dependencies:
         - 0
         version: 0.9.0
   type: :development
-  prerelease: false
-  name: cucumber
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -158,10 +160,10 @@ dependencies:
         - 0
         version: 2.0.0
   type: :development
-  prerelease: false
-  name: rspec
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -174,10 +176,10 @@ dependencies:
         - 0
         version: 1.4.0
   type: :development
-  prerelease: false
-  name: json
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
+  name: awesome_print
+  prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -188,8 +190,6 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  prerelease: false
-  name: awesome_print
   version_requirements: *id011
 description: A suite of utilities for bringing continous integration to your projects (not the other way around) with hudson CI
 email: 
@@ -202,8 +202,14 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- bin/hudson
+- .gitignore
 - Changelog.md
+- Gemfile
+- Gemfile.lock
+- README.md
+- Rakefile
+- bin/hudson
+- features/default_host.feature
 - features/development.feature
 - features/launch_server.feature
 - features/listing_jobs.feature
@@ -216,91 +222,33 @@ files:
 - features/support/common.rb
 - features/support/env.rb
 - features/support/hooks.rb
+- features/support/hudson_helpers.rb
 - features/support/matchers.rb
-- fixtures/projects/non-bundler/Rakefile
-- fixtures/projects/rails-3/app/controllers/application_controller.rb
-- fixtures/projects/rails-3/app/helpers/application_helper.rb
-- fixtures/projects/rails-3/app/views/layouts/application.html.erb
-- 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/development.rb
-- fixtures/projects/rails-3/config/environments/production.rb
-- fixtures/projects/rails-3/config/environments/test.rb
-- 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/en.yml
-- fixtures/projects/rails-3/config/routes.rb
-- fixtures/projects/rails-3/config.ru
-- fixtures/projects/rails-3/db/seeds.rb
-- fixtures/projects/rails-3/doc/README_FOR_APP
-- fixtures/projects/rails-3/Gemfile
-- fixtures/projects/rails-3/Gemfile.lock
-- 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/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/rails.png
-- fixtures/projects/rails-3/public/index.html
-- 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/Rakefile
-- fixtures/projects/rails-3/README
-- fixtures/projects/rails-3/script/rails
-- fixtures/projects/rails-3/test/performance/browsing_test.rb
-- fixtures/projects/rails-3/test/test_helper.rb
-- fixtures/projects/ruby/Gemfile
-- fixtures/projects/ruby/Gemfile.lock
-- fixtures/projects/ruby/Rakefile
-- Gemfile
-- Gemfile.lock
 - hudson.gemspec
+- lib/hudson.rb
 - lib/hudson/api.rb
-- lib/hudson/cli/formatting.rb
 - lib/hudson/cli.rb
+- lib/hudson/cli/formatting.rb
 - lib/hudson/config.rb
 - lib/hudson/core_ext/hash.rb
 - lib/hudson/core_ext/object/blank.rb
 - lib/hudson/hudson-cli.jar
-- lib/hudson/hudson.war
-- lib/hudson/hudson_version.rb
+- lib/hudson/installation.rb
 - lib/hudson/job_config_builder.rb
-- lib/hudson/plugins/envfile.hpi
-- 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/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.multi-ruby-multi-labels.config.xml
+- spec/fixtures/ruby.multi.config.xml
 - spec/fixtures/ruby.single.config.xml
-- spec/fixtures/rubygem.config.xml
 - spec/fixtures/therubyracer.config.xml
 - spec/hash_key_cleaner_spec.rb
 - spec/job_config_builder_spec.rb
 - spec/spec_helper.rb
-- tasks/upgrade.rake
 has_rdoc: true
 homepage: http://github.com/cowboyd/hudson.rb
 licenses: []