hudson 0.3.0.beta.17 → 0.3.0.beta.18

data/Gemfile.lock

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

data/features/manage_slave_nodes.feature

@@ -6,14 +6,13 @@ Feature: Adding slave nodes
   Background:
     Given I have a Hudson server running
     And the Hudson server has no slaves
-
-  Scenario: List available slaves (hudson nodes)
     When I run local executable "hudson" with arguments "nodes --host localhost --port 3010"
     Then I should see exactly
       """
       master
       """
 
+  Scenario: Add slave via API (hudson nodes)
     When I create a new node with the following options on "http://localhost:3010":
       | name       | Slave 1        |
       | label      | app1 app2 app3 |
@@ -24,4 +23,23 @@ Feature: Adding slave nodes
       """
       master
       Slave 1
+      """
+
+  Scenario: Add slave via CLI with name defaulted to URL (hudson add_node)
+    When I run local executable "hudson" with arguments "add_node foo1.bar.com --slave-user deploy --label 'app1 app2' --host localhost --port 3010"
+    Then I should see exactly
+      """
+      Added slave node foo1.bar.com
+      """
+    When I run local executable "hudson" with arguments "add_node foo1.bar.com --slave-user deploy --label 'app1 app2' --host localhost --port 3010"
+    Then I should see exactly
+      """
+      Slave called 'foo1.bar.com' already exists
+      ERROR: Failed to add slave node foo1.bar.com
+      """
+    When I run local executable "hudson" with arguments "nodes"
+    Then I should see exactly
+      """
+      master
+      foo1.bar.com
       """

data/hudson.gemspec

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

@@ -3,6 +3,7 @@ require 'cgi'
 require 'uri'
 require 'json'
 
+require 'hudson/core_ext/hash'
 require 'hudson/config'
 
 module Hudson
@@ -16,6 +17,7 @@ module Hudson
     JobAlreadyExistsError = Class.new(Exception)
 
     def self.setup_base_url(options)
+      options = options.with_clean_keys
       # Thor's HashWithIndifferentAccess is based on string keys which URI::HTTP.build ignores
       options = options.inject({}) { |mem, (key, val)| mem[key.to_sym] = val; mem }
       options[:host] ||= ENV['HUDSON_HOST']
@@ -36,6 +38,7 @@ module Hudson
     #
     # TODO Exceptions?
     def self.create_job(name, job_config, options = {})
+      options = options.with_clean_keys
       delete_job(name) if options[:override]
       begin
         res = post "/createItem/api/xml?name=#{CGI.escape(name)}", {
@@ -103,19 +106,22 @@ module Hudson
 
     # Adds SSH nodes only, for now
     def self.add_node(options = {})
-      default_options = Hash.new("")
+      options = options.with_clean_keys
+      default_options = Hash.new
       default_options.merge!(
         :slave_port  => 22,
-        :master_key  => "/home/hudson/.ssh/id_rsa", # FIXME - hardcoded master username assumption
-        :remote_fs   => "/data/hudson-slave/",
+        :master_key  => "/home/deploy/.ssh/id_rsa", # FIXME - hardcoded master username assumption
+        :slave_fs    => "/data/hudson-slave/",
         :description => "Automatically created by Hudson.rb",
         :executors   => 2,
         :exclusive   => true
       )
 
-      options = default_options.merge(options)
+      slave_host = options[:slave_host]
+      name       = options[:name] || slave_host
 
-      name = options[:name]
+      options    = default_options.merge(options)
+      
       type = "hudson.slaves.DumbSlave$DescriptorImpl"
 
       fields = {
@@ -126,7 +132,7 @@ module Hudson
           "name"              => name,
           "nodeDescription"   => options[:description],
           "numExecutors"      => options[:executors],
-          "remoteFS"          => options[:remote_fs],
+          "remoteFS"          => options[:slave_fs],
           "labelString"       => options[:label],
           "mode"              => options[:exclusive] ? "EXCLUSIVE" : "NORMAL",
           "type"              => type,
@@ -134,24 +140,36 @@ module Hudson
           "nodeProperties"    => { "stapler-class-bag" => "true" },
           "launcher"          => {
             "stapler-class" => "hudson.plugins.sshslaves.SSHLauncher",
-            "host"          => options[:slave_host],
+            "host"          => slave_host,
+            "port"          => options[:slave_port],
             "username"      => options[:slave_user],
             "privatekey"    => options[:master_key],
-            "port"          => options[:slave_port]
           }
         }.to_json
       }
 
       url = URI.parse("#{base_uri}/computer/doCreateItem")
+
       req = Net::HTTP::Post.new(url.path)
       req.set_form_data(fields)
 
       http = Net::HTTP.new(url.host, url.port)
 
-      case http.request(req)
+      response = http.request(req)
+      case response
       when Net::HTTPFound
         true
       else
+        # error message looks like:
+        # <td id="main-panel">
+        # <h1>Error</h1><p>Slave called 'localhost' already exists</p>
+        require "hpricot"
+        error = Hpricot(response.body).search("td#main-panel p").text
+        unless error.blank?
+          puts error
+        else
+          puts response.body # so we can find other errors
+        end
         false
       end
     end
@@ -162,12 +180,14 @@ module Hudson
 
     # Helper for POST that don't barf at Hudson's crappy API responses
     def self.post_plain(path, options = {})
+      options = options.with_clean_keys
       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 = {})
+      options = options.with_clean_keys
       uri = URI.parse base_uri
       res = Net::HTTP.start(uri.host, uri.port) { |http| http.get(path, options) }
     end

data/lib/hudson/cli.rb

@@ -1,5 +1,6 @@
 require 'thor'
 require 'hudson/core_ext/object/blank'
+require 'hudson/core_ext/hash'
 require 'hudson/cli/formatting'
 require 'hudson/remote'
 
@@ -50,8 +51,8 @@ module Hudson
     common_options
     method_option :"no-build", :desc => "create job without initial build", :type => :boolean, :default => false
     method_option :override, :desc => "override if job exists", :type => :boolean, :default => false
-    method_option :public_scm, :desc => "use public scm URL", :type => :boolean, :default => false
-    method_option :assigned_node, :desc => "only use slave nodes with this label"
+    method_option :"public-scm", :desc => "use public scm URL", :type => :boolean, :default => false
+    method_option :"assigned-node", :desc => "only use slave nodes with this label"
     method_option :template, :desc => "template of job steps (available: #{JobConfigBuilder::VALID_JOB_TEMPLATES.join ','})", :default => 'ruby'
     def create(project_path)
       select_hudson_server(options)
@@ -66,8 +67,8 @@ module Hudson
           template = options[:template]
           job_config = Hudson::JobConfigBuilder.new(template) do |c|
             c.scm = scm.url
-            c.assigned_node = options[:assigned_node] if options[:assigned_node]
-            c.public_scm = options[:public_scm]
+            c.assigned_node = options[:"assigned-node"] if options[:"assigned-node"]
+            c.public_scm = options[:"public-scm"]
           end
           name = File.basename(FileUtils.pwd)
           if Hudson::Api.create_job(name, job_config, options)
@@ -152,6 +153,23 @@ module Hudson
         shell.say node["displayName"], color
       end
     end
+    
+    desc "add_node SLAVE_HOST", "add a URI (user@host:port) server as a slave node"
+    method_option :label, :desc => 'Labels for a job --assigned_node to match against to select a slave. Space separated list.'
+    method_option :"slave-user", :desc => 'SSH user for Hudson to connect to slave node', :default => "deploy"
+    method_option :"slave-port", :desc => 'SSH port for Hudson to connect to slave node', :default => 22
+    method_option :"master-key", :desc => 'Location of master public key or identity file'
+    method_option :"slave-fs", :desc => 'Location of file system on slave for Hudson to use'
+    method_option :name, :desc => 'Name of slave node (default SLAVE_HOST)'
+    common_options
+    def add_node(slave_host)
+      select_hudson_server(options)
+      if Hudson::Api.add_node({:slave_host => slave_host}.merge(options))
+        shell.say "Added slave node #{slave_host}", :green
+      else
+        error "Failed to add slave node #{slave_host}"
+      end
+    end
 
     desc "help [command]", "show help for hudson or for a specific command"
     def help(*args)

data/lib/hudson/core_ext/hash.rb

@@ -0,0 +1,9 @@
+class Hash
+  def with_clean_keys
+    self.inject({}) do |mem, (key, value)|
+      clean_key = key.to_s.gsub(/-/,"_").to_sym
+      mem[clean_key] = value
+      mem
+    end
+  end
+end

data/lib/hudson/job_config_builder.rb

@@ -138,8 +138,9 @@ module Hudson
       end
     end
     
-    # TODO modularise this
-    # TODO how to customize? e.g. EngineYard template?
+    # The important sequence of steps that are run to process a job build.
+    # Can be defaulted by the +job_type+ using +default_steps(job_type)+,
+    # or customized via +steps+ array.
     def build_steps(b)
       b.builders do
         self.steps ||= default_steps(job_type)
@@ -163,7 +164,14 @@ module Hudson
               FileUtils.cp example, "config/database.yml"
             end
             RUBY
-          [:build_shell_step, "bundle exec rake db:schema:load"],
+          [:build_shell_step, "bundle exec rake db:create:all"],
+          [:build_shell_step, <<-RUBY.gsub(/^            /, '')],
+            if [ -f db/schema.rb ]; then
+              bundle exec rake db:migrate
+            else
+              bundle exec rake db:schema:load
+            fi
+            RUBY
           [:build_shell_step, "bundle exec rake"]
         ]
       else

data/lib/hudson/version.rb

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

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

@@ -60,7 +60,15 @@ end
       </command>
     </hudson.plugins.ruby.Ruby>
     <hudson.tasks.Shell>
-      <command>bundle exec rake db:schema:load</command>
+      <command>bundle exec rake db:create:all</command>
+    </hudson.tasks.Shell>
+    <hudson.tasks.Shell>
+      <command>if [ -f db/schema.rb ]; then
+  bundle exec rake db:migrate
+else
+  bundle exec rake db:schema:load
+fi
+</command>
     </hudson.tasks.Shell>
     <hudson.tasks.Shell>
       <command>bundle exec rake</command>

data/spec/hash_key_cleaner_spec.rb

@@ -0,0 +1,25 @@
+require File.dirname(__FILE__) + "/spec_helper"
+
+require "hudson/core_ext/hash"
+
+describe Hash do
+  subject do
+    {
+      :simple => "simple",
+      :under_score => "under_score",
+      :"hyp-hen" => "hyphen",
+      "str_under_score" => "str_under_score",
+      "str-hyp-hen" => "str-hyp-hen"
+    }
+  end
+  
+  it do
+    subject.with_clean_keys.should == {
+      :simple => "simple",
+      :under_score => "under_score",
+      :hyp_hen => "hyphen",
+      :str_under_score => "str_under_score",
+      :str_hyp_hen => "str-hyp-hen"
+    }
+  end
+end

data/spec/job_config_builder_spec.rb

@@ -5,16 +5,17 @@ describe Hudson::JobConfigBuilder do
   
   describe "explicit steps to match a ruby job" do
     before do
-      @config = Hudson::JobConfigBuilder.new do |c|
+      @config = Hudson::JobConfigBuilder.new(:rails) 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"]
+          [:build_shell_step, "step 1"],
+          [:build_shell_step, "step 2"]
         ]
       end
     end
     it "builds config.xml" do
-      config_xml("ruby", "single").should == @config.to_xml
+      steps = Hpricot.XML(@config.to_xml).search("command")
+      steps.map(&:inner_text).should == ["step 1", "step 2"]
     end
   end
   

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: hudson
 version: !ruby/object:Gem::Version 
-  hash: 62196401
+  hash: 62196407
   prerelease: true
   segments: 
   - 0
   - 3
   - 0
   - beta
-  - 17
-  version: 0.3.0.beta.17
+  - 18
+  version: 0.3.0.beta.18
 platform: ruby
 authors: 
 - Charles Lowell
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-03 00:00:00 -07:00
+date: 2010-11-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -273,6 +273,7 @@ files:
 - lib/hudson/cli/formatting.rb
 - lib/hudson/cli.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
@@ -297,6 +298,7 @@ files:
 - 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