hudson 0.3.0.beta.16 → 0.3.0.beta.17

data/Gemfile.lock

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

data/hudson.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hudson}
-  s.version = "0.3.0.beta.16"
+  s.version = "0.3.0.beta.17"
 
   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-02}
+  s.date = %q{2010-11-03}
   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"]

data/lib/hudson/job_config_builder.rb

@@ -10,6 +10,8 @@ module Hudson
     
     InvalidTemplate = Class.new(StandardError)
     
+    VALID_JOB_TEMPLATES = %w[rails rails3 ruby rubygem]
+    
     # +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+.
@@ -23,6 +25,7 @@ module Hudson
       yield self
 
       self.git_branches ||= ["master"]
+      raise InvalidTemplate unless VALID_JOB_TEMPLATES.include?(job_type.to_s)
     end
   
     def builder
@@ -108,20 +111,6 @@ module Hudson
         end
       end
     end
-  
-    #   <triggers class="vector">
-    #     <hudson.triggers.SCMTrigger>
-    #       <spec># every minute
-    #         * * * * *</spec>
-    #     </hudson.triggers.SCMTrigger>
-    #   </triggers>
-    def build_triggers(b)
-      b.triggers :class => "vector" do
-        b.tag! "hudson.triggers.SCMTrigger" do
-          b.spec "# every minute\n* * * * *"
-        end
-      end
-    end
 
     # TODO
     def build_axes(b)
@@ -151,14 +140,22 @@ module Hudson
     
     # TODO modularise this
     # TODO how to customize? e.g. EngineYard template?
-    VALID_JOB_TEMPLATES = %w[rails rails3 ruby rubygem]
     def build_steps(b)
       b.builders do
-        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(/^            /, '')
+        self.steps ||= default_steps(job_type)
+        steps.each do |step|
+          method, cmd = step
+          send(method.to_sym, b, cmd) # e.g. build_shell_step(b, "bundle install")
+        end
+      end
+    end
+    
+    def default_steps(job_type)
+      case job_type.to_sym
+      when :rails, :rails3
+        [
+          [:build_shell_step, "bundle install"],
+          [:build_ruby_step, <<-RUBY.gsub(/^            /, '')],
             unless File.exist?("config/database.yml")
               require 'fileutils'
               example = Dir["config/database*"].first
@@ -166,18 +163,14 @@ module Hudson
               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
-        else
-          steps.each do |step|
-            method, cmd = step
-            send(method.to_sym, b, cmd)
-          end
-        end
+          [:build_shell_step, "bundle exec rake db:schema:load"],
+          [:build_shell_step, "bundle exec rake"]
+        ]
+      else
+        [
+          [:build_shell_step, "bundle install"],
+          [:build_shell_step, "bundle exec rake"]
+        ]
       end
     end
   

data/lib/hudson/version.rb

@@ -1,3 +1,3 @@
 module Hudson
-  VERSION = "0.3.0.beta.16"
+  VERSION = "0.3.0.beta.17"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: hudson
 version: !ruby/object:Gem::Version 
-  hash: 62196403
+  hash: 62196401
   prerelease: true
   segments: 
   - 0
   - 3
   - 0
   - beta
-  - 16
-  version: 0.3.0.beta.16
+  - 17
+  version: 0.3.0.beta.17
 platform: ruby
 authors: 
 - Charles Lowell
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-02 00:00:00 -07:00
+date: 2010-11-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency