hudson 0.3.0.beta.9 → 0.3.0.beta.10

data/Gemfile.lock

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

data/hudson.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hudson}
-  s.version = "0.3.0.beta.9"
+  s.version = "0.3.0.beta.10"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Charles Lowell", "Dr Nic Williams"]

data/lib/hudson.rb

@@ -1,5 +1,5 @@
 module Hudson
-  VERSION        = "0.3.0.beta.9"
+  VERSION        = "0.3.0.beta.10"
   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/cli.rb

@@ -56,7 +56,7 @@ module Hudson
         unless scm = Hudson::ProjectScm.discover
           error "Cannot determine project SCM. Currently supported: #{Hudson::ProjectScm.supported}"
         end
-        job_config = Hudson::JobConfigBuilder.new(:rubygem) do |c|
+        job_config = Hudson::JobConfigBuilder.new(:rails) do |c|
           c.scm = scm.url
           c.assigned_node = options[:assigned_node] if options[:assigned_node]
         end

data/lib/hudson/job_config_builder.rb

@@ -108,6 +108,7 @@ module Hudson
     def build_steps(b)
       b.builders do
         if job_type == "rails"
+          build_shell_step b, "bundle install"
           build_ruby_step b, <<-RUBY.gsub(/^          /, '')
           unless File.exist?("config/database.yml")
             require 'fileutils'
@@ -116,15 +117,23 @@ module Hudson
             FileUtils.cp example, "config/database.yml"
           end
           RUBY
-          build_rake_step b, "db:schema:load"
-          build_rake_step b, "features"
-          build_rake_step b, "spec"
+          build_shell_step b, "bundle exec rake db:schema:load"
+          build_shell_step b, "bundle exec rake"
         elsif job_type == "rubygem"
           build_rake_step b, "features"
         end
       end
     end
   
+    # <hudson.tasks.Shell>
+    #   <command>bundle install</command>
+    # </hudson.tasks.Shell>
+    def build_shell_step(b, command)
+      b.tag! "hudson.tasks.Shell" do
+        b.command command.to_xs.gsub(%r{"}, '&quot;').gsub(%r{'}, '&apos;')
+      end
+    end
+
     # <hudson.plugins.ruby.Ruby>
     #   <command>unless File.exist?(&quot;config/database.yml&quot;)
     #   require &apos;fileutils&apos;

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

@@ -38,6 +38,9 @@
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <concurrentBuild>false</concurrentBuild>
   <builders>
+    <hudson.tasks.Shell>
+      <command>bundle install</command>
+    </hudson.tasks.Shell>
     <hudson.plugins.ruby.Ruby>
       <command>
 unless File.exist?(&quot;config/database.yml&quot;)
@@ -48,30 +51,12 @@ unless File.exist?(&quot;config/database.yml&quot;)
 end
       </command>
     </hudson.plugins.ruby.Ruby>
-    <hudson.plugins.rake.Rake>
-      <rakeInstallation>(Default)</rakeInstallation>
-      <rakeFile/>
-      <rakeLibDir/>
-      <rakeWorkingDir/>
-      <tasks>db:schema:load</tasks>
-      <silent>false</silent>
-    </hudson.plugins.rake.Rake>
-    <hudson.plugins.rake.Rake>
-      <rakeInstallation>(Default)</rakeInstallation>
-      <rakeFile/>
-      <rakeLibDir/>
-      <rakeWorkingDir/>
-      <tasks>features</tasks>
-      <silent>false</silent>
-    </hudson.plugins.rake.Rake>
-    <hudson.plugins.rake.Rake>
-      <rakeInstallation>(Default)</rakeInstallation>
-      <rakeFile/>
-      <rakeLibDir/>
-      <rakeWorkingDir/>
-      <tasks>spec</tasks>
-      <silent>false</silent>
-    </hudson.plugins.rake.Rake>
+    <hudson.tasks.Shell>
+      <command>bundle exec rake db:schema:load</command>
+    </hudson.tasks.Shell>
+    <hudson.tasks.Shell>
+      <command>bundle exec rake</command>
+    </hudson.tasks.Shell>
   </builders>
   <publishers/>
   <buildWrappers/>

data/spec/job_config_builder_spec.rb

@@ -11,8 +11,7 @@ describe Hudson::JobConfigBuilder do
       end
     end
     it "builds config.xml" do
-      config_xml = config_xml("rails", "single")
-      config_xml.should == @config.to_xml
+      config_xml("rails", "single").should == @config.to_xml
     end
   end
   
@@ -23,8 +22,7 @@ describe Hudson::JobConfigBuilder do
       end
     end
     it "builds config.xml" do
-      config_xml = config_xml("rubygem")
-      config_xml.should == @config.to_xml
+      config_xml("rubygem").should == @config.to_xml
     end
   end
   

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: hudson
 version: !ruby/object:Gem::Version 
-  hash: 62196353
+  hash: 62196359
   prerelease: true
   segments: 
   - 0
   - 3
   - 0
   - beta
-  - 9
-  version: 0.3.0.beta.9
+  - 10
+  version: 0.3.0.beta.10
 platform: ruby
 authors: 
 - Charles Lowell