hudson 0.3.0.beta.1 → 0.3.0.beta.2

data/bin/hudson

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 require 'rubygems'
 $:.unshift(File.expand_path(File.dirname(File.dirname(__FILE__) + "/../lib/hudson.rb")))
-require File.dirname(__FILE__) + '/../lib/hudson'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/hudson')
 require 'hudson/cli'
 
 Hudson::CLI.start

data/bin/hudson.compiled.rbc

@@ -0,0 +1,197 @@
+!RBIX
+0
+x
+M
+1
+n
+n
+x
+10
+__script__
+i
+89
+5
+7
+0
+64
+47
+49
+1
+1
+15
+99
+43
+2
+7
+3
+49
+4
+1
+45
+5
+6
+45
+5
+7
+45
+5
+8
+65
+49
+9
+0
+49
+10
+1
+7
+11
+64
+81
+12
+49
+10
+1
+49
+13
+1
+49
+14
+1
+15
+5
+45
+5
+15
+65
+49
+9
+0
+49
+10
+1
+7
+16
+64
+81
+12
+47
+49
+1
+1
+15
+5
+7
+17
+64
+47
+49
+1
+1
+15
+45
+18
+19
+43
+20
+49
+21
+0
+15
+2
+11
+I
+5
+I
+0
+I
+0
+I
+0
+n
+p
+22
+s
+8
+rubygems
+x
+7
+require
+x
+7
+Globals
+x
+2
+$:
+x
+2
+[]
+x
+4
+File
+n
+n
+n
+x
+11
+active_path
+x
+7
+dirname
+s
+17
+/../lib/hudson.rb
+x
+1
++
+x
+11
+expand_path
+x
+7
+unshift
+n
+s
+14
+/../lib/hudson
+s
+10
+hudson/cli
+x
+6
+Hudson
+n
+x
+3
+CLI
+x
+5
+start
+p
+11
+I
+0
+I
+2
+I
+9
+I
+3
+I
+30
+I
+4
+I
+45
+I
+5
+I
+4e
+I
+7
+I
+59
+x
+47
+/Users/drnic/Projects/gems/hudson.rb/bin/hudson
+p
+0

data/features/adding_slave_nodes.feature

@@ -0,0 +1,27 @@
+Feature: Adding slave nodes
+  In order to have different environments for different projects
+  As a developer
+  I want to add new slave nodes to my Hudson instance
+
+  Background:
+    Given I have a Hudson server running
+    And the Hudson server has no slaves
+
+  Scenario: Add a slave with no authentication required
+    When I run local executable "hudson" with arguments "nodes --host localhost --port 3010"
+    Then I should see exactly
+      """
+      master
+      """
+
+    When I create a new node with the following options on "http://localhost:3010":
+      | name       | Slave 1        |
+      | label      | app1 app2 app3 |
+      | slave_host | foo1.bar.com   |
+      | slave_user | hudson         |
+    When I run local executable "hudson" with arguments "nodes --host localhost --port 3010"
+    Then I should see exactly
+      """
+      master
+      Slave 1
+      """

data/features/listing_jobs.feature

@@ -2,13 +2,13 @@ Feature: Listing jobs
   I want to see the status of jobs on servers I'm interested in
 
   Scenario: List jobs on a non-existent server
-    When I run local executable "hudson" with arguments "list test --host localhost --port 9999"
+    When I run local executable "hudson" with arguments "list --host localhost --port 9999"
     Then I should see "localhost:9999 - no connection"
   
   Scenario: List jobs on a server with no jobs
     Given I have a Hudson server running
     And the Hudson server has no current jobs
-    When I run local executable "hudson" with arguments "list test --host localhost --port 3010"
+    When I run local executable "hudson" with arguments "list --host localhost --port 3010"
     Then I should see "localhost:3010 - no jobs"
   
   Scenario: List jobs on a server with jobs

data/features/step_definitions/common_steps.rb

@@ -18,7 +18,7 @@ When /^I invoke "(.*)" generator with arguments "(.*)"$/ do |generator, argument
   in_project_folder do
     if Object.const_defined?("APP_ROOT")
       APP_ROOT.replace(FileUtils.pwd)
-    else 
+    else
       APP_ROOT = FileUtils.pwd
     end
     run_generator(generator, arguments.split(' '), SOURCES, :stdout => @stdout)
@@ -32,14 +32,14 @@ end
 When /^I run executable "(.*)" with arguments "(.*)"/ do |executable, arguments|
   @stdout = File.expand_path(File.join(@tmp_root, "executable.out"))
   in_project_folder do
-    system "#{executable} #{arguments} > #{@stdout} 2> #{@stdout}"
+    system "#{executable.inspect} #{arguments} > #{@stdout.inspect} 2> #{@stdout.inspect}"
   end
 end
 
 When /^I run project executable "(.*)" with arguments "(.*)"/ do |executable, arguments|
   @stdout = File.expand_path(File.join(@tmp_root, "executable.out"))
   in_project_folder do
-    system "ruby #{executable} #{arguments} > #{@stdout} 2> #{@stdout}"
+    system "ruby #{executable.inspect} #{arguments} > #{@stdout.inspect} 2> #{@stdout.inspect}"
   end
 end
 
@@ -47,14 +47,14 @@ When /^I run local executable "(.*)" with arguments "(.*)"/ do |executable, argu
   @stdout = File.expand_path(File.join(@tmp_root, "executable.out"))
   executable = File.expand_path(File.join(File.dirname(__FILE__), "/../../bin", executable))
   in_project_folder do
-    system "ruby #{executable} #{arguments} > #{@stdout} 2> #{@stdout}"
+    system "ruby #{executable.inspect} #{arguments} > #{@stdout.inspect} 2> #{@stdout.inspect}"
   end
 end
 
 When /^I invoke task "rake (.*)"/ do |task|
   @stdout = File.expand_path(File.join(@tmp_root, "tests.out"))
   in_project_folder do
-    system "rake #{task} --trace > #{@stdout} 2> #{@stdout}"
+    system "rake #{task} --trace > #{@stdout.inspect} 2> #{@stdout.inspect}"
   end
 end
 
@@ -94,52 +94,52 @@ Then /gem file "(.*)" and generated file "(.*)" should be the same/ do |gem_file
 end
 
 Then /^(does|does not) invoke generator "(.*)"$/ do |does_invoke, generator|
-  actual_output = File.read(@stdout)
+  actual_output = get_command_output
   does_invoke == "does" ?
     actual_output.should(match(/dependency\s+#{generator}/)) :
     actual_output.should_not(match(/dependency\s+#{generator}/))
 end
 
 Then /help options "(.*)" and "(.*)" are displayed/ do |opt1, opt2|
-  actual_output = File.read(@stdout)
+  actual_output = get_command_output
   actual_output.should match(/#{opt1}/)
   actual_output.should match(/#{opt2}/)
 end
 
 Then /^I should see "([^\"]*)"$/ do |text|
-  actual_output = File.read(@stdout)
+  actual_output = get_command_output
   actual_output.should contain(text)
 end
 
 Then /^I should not see "([^\"]*)"$/ do |text|
-  actual_output = File.read(@stdout)
+  actual_output =
   actual_output.should_not contain(text)
 end
 
 Then /^I should see$/ do |text|
-  actual_output = File.read(@stdout)
+  actual_output = get_command_output
   actual_output.should contain(text)
 end
 
 Then /^I should not see$/ do |text|
-  actual_output = File.read(@stdout)
+  actual_output = get_command_output
   actual_output.should_not contain(text)
 end
 
 Then /^I should see exactly$/ do |text|
-  actual_output = File.read(@stdout)
+  actual_output = get_command_output
   actual_output.should == text
 end
 
 Then /^I should see all (\d+) tests pass/ do |expected_test_count|
   expected = %r{^#{expected_test_count} tests, \d+ assertions, 0 failures, 0 errors}
-  actual_output = File.read(@stdout)
+  actual_output = get_command_output
   actual_output.should match(expected)
 end
 
 Then /^I should see all (\d+) examples pass/ do |expected_test_count|
   expected = %r{^#{expected_test_count} examples?, 0 failures}
-  actual_output = File.read(@stdout)
+  actual_output = get_command_output
   actual_output.should match(expected)
 end
 
@@ -153,15 +153,15 @@ end
 Then /^Rakefile can display tasks successfully/ do
   @stdout = File.expand_path(File.join(@tmp_root, "rakefile.out"))
   in_project_folder do
-    system "rake -T > #{@stdout} 2> #{@stdout}"
+    system "rake -T > #{@stdout.inspect} 2> #{@stdout.inspect}"
   end
-  actual_output = File.read(@stdout)
+  actual_output = get_command_output
   actual_output.should match(/^rake\s+\w+\s+#\s.*/)
 end
 
 Then /^task "rake (.*)" is executed successfully/ do |task|
   @stdout.should_not be_nil
-  actual_output = File.read(@stdout)
+  actual_output = get_command_output
   actual_output.should_not match(/^Don't know how to build task '#{task}'/)
   actual_output.should_not match(/Error/i)
 end
@@ -179,3 +179,13 @@ Then /^the file "([^\"]*)" is a valid gemspec$/ do |filename|
   spec = eval(File.read(filename))
   spec.validate
 end
+
+When /^I create a new node with the following options on "http:\/\/(.+?):(\d+)":$/ do |host, port, table|
+  options = table.raw.inject({}) do |options, (key, value)|
+    options[(key.to_sym rescue key) || key] = value
+    options
+  end
+
+  Hudson::Api.setup_base_url(:host => host, :port => port.to_i)
+  Hudson::Api.add_node(options)
+end

data/features/step_definitions/hudson_steps.rb

@@ -29,6 +29,26 @@ Given /^the Hudson server has no current jobs$/ do
   end
 end
 
+Given /^the Hudson server has no slaves$/ do
+  if port = @hudson_port
+    require "open-uri"
+    require "yajl"
+    base_url    = "http://#{@hudson_host}:#{@hudson_port}"
+    hudson_info = Yajl::Parser.new.parse(open("#{base_url}/computer/api/json"))
+
+    hudson_info['computer'].each do |node|
+      name = node["displayName"]
+      next if name == "master"
+      job_url = "#{base_url}/computer/#{CGI::escape(name).gsub('+', '%20')}"
+      res = Net::HTTP.start("localhost", port) { |http| http.post("#{job_url}/doDelete/api/json", {}) }
+    end
+    hudson_info = Yajl::Parser.new.parse(open("http://#{@hudson_host}:#{@hudson_port}/api/json"))
+    hudson_info['jobs'].should == []
+  else
+    puts "WARNING: Run 'I have a Hudson server running' step first."
+  end
+end
+
 Given /^there is nothing listening on port (\d+)$/ do |port|
   lambda {
     TCPSocket.open("localhost", port) {}
@@ -56,7 +76,7 @@ When /^I run hudson server with arguments "(.*)"/ do |arguments|
   @stdout = File.expand_path(File.join(@tmp_root, "executable.out"))
   executable = File.expand_path(File.join(File.dirname(__FILE__), "/../../bin","hudson"))
   in_project_folder do
-    system "ruby #{executable} server #{arguments} > #{@stdout} 2>#{@stdout}"
+    system "ruby #{executable.inspect} server #{arguments} > #{@stdout.inspect} 2> #{@stdout.inspect}"
   end
 end
 

data/features/support/common.rb

@@ -1,4 +1,12 @@
 module CommonHelpers
+  def get_command_output
+    strip_color_codes(File.read(@stdout)).chomp
+  end
+
+  def strip_color_codes(text)
+    text.gsub(/\e\[\d+m/, '')
+  end
+
   def in_tmp_folder(&block)
     FileUtils.chdir(@tmp_root, &block)
   end

data/hudson.gemspec

@@ -2,16 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hudson}
-  s.version = "0.3.0.beta.1"
+  s.version = "0.3.0.beta.2"
 
   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-10-11}
+  s.date = %q{2010-10-27}
   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/create_jobs.feature", "features/development.feature", "features/fixtures", "features/fixtures/projects", "features/fixtures/projects/ruby", "features/fixtures/projects/ruby/Rakefile", "features/listing_jobs.feature", "features/managing_remote_servers.feature", "features/server.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", "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/hudson-cli.jar", "lib/hudson/hudson.war", "lib/hudson/job_config_builder.rb", "lib/hudson/plugins", "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.rb", "Rakefile", "README.md", "spec", "spec/fixtures", "spec/fixtures/ec2_global.config.xml", "spec/fixtures/rails.multi.config.xml", "spec/fixtures/rails.single.config.xml", "spec/fixtures/rubygem.config.xml", "spec/fixtures/therubyracer.config.xml", "spec/job_config_builder_spec.rb", "spec/spec_helper.rb"]
+  s.files = ["bin", "bin/hudson", "bin/hudson.compiled.rbc", "features", "features/adding_slave_nodes.feature", "features/create_jobs.feature", "features/development.feature", "features/fixtures", "features/fixtures/projects", "features/fixtures/projects/ruby", "features/fixtures/projects/ruby/Rakefile", "features/listing_jobs.feature", "features/managing_remote_servers.feature", "features/server.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", "Gemfile", "Gemfile.lock", "hudson.gemspec", "lib", "lib/hudson", "lib/hudson/api.rb", "lib/hudson/api.rbc", "lib/hudson/cli", "lib/hudson/cli/formatting.rb", "lib/hudson/cli.rb", "lib/hudson/config.rb", "lib/hudson/hudson-cli.jar", "lib/hudson/hudson.war", "lib/hudson/job_config_builder.rb", "lib/hudson/plugins", "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.rb", "lib/hudson.rbc", "Rakefile", "README.md", "spec", "spec/fixtures", "spec/fixtures/ec2_global.config.xml", "spec/fixtures/rails.multi.config.xml", "spec/fixtures/rails.single.config.xml", "spec/fixtures/rubygem.config.xml", "spec/fixtures/therubyracer.config.xml", "spec/job_config_builder_spec.rb", "spec/spec_helper.rb"]
   s.homepage = %q{http://github.com/cowboyd/hudson.rb}
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{hudson}