hudson 0.3.0.beta.12 → 0.3.0.beta.13

data/Gemfile.lock

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

data/Rakefile

@@ -76,7 +76,7 @@ task :default => ["hudson:server:killtest", "hudson:server:test"] do
     Net::HTTP.start("localhost", "3010") { |http| http.get('/') }
     sleep(10)
     puts ""
-    Rake::Task["cucumber:ok"].invoke
+    result = Rake::Task["cucumber:ok"].invoke
   rescue Exception => e
     if tries <= 15
       sleep 2
@@ -89,6 +89,7 @@ task :default => ["hudson:server:killtest", "hudson:server:test"] do
       task.invoke
     end
   end
+  raise unless result
 end
 
 namespace :hudson do

data/bin/hudson

@@ -4,4 +4,8 @@ $:.unshift(File.expand_path(File.dirname(File.dirname(__FILE__) + "/../lib/hudso
 require File.expand_path(File.dirname(__FILE__) + '/../lib/hudson')
 require 'hudson/cli'
 
-Hudson::CLI.start
+begin
+  Hudson::CLI.start
+rescue Errno::ECONNREFUSED, Errno::EAFNOSUPPORT
+  Hudson::CLI.new.shell.say "No connection available to server.", :red
+end

data/features/step_definitions/hudson_steps.rb

@@ -34,16 +34,23 @@ Given /^the Hudson server has no slaves$/ do
     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 = Yajl::Parser.new.parse(open("#{base_url}/api/json"))
+    (hudson_info['jobs'] || []).each do |job|
+      job_url = job['url']
+      res = Net::HTTP.start("localhost", port) { |http| http.post("#{job_url}doDelete/api/json", {}) }
+    end
+    hudson_info = Yajl::Parser.new.parse(open("#{base_url}/api/json"))
+    hudson_info['jobs'].should == []
 
+    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 == []
+    hudson_info = Yajl::Parser.new.parse(open("#{base_url}/computer/api/json"))
+    hudson_info['computer'].size.should == 1
   else
     puts "WARNING: Run 'I have a Hudson server running' step first."
   end

data/features/support/env.rb

@@ -1,6 +1,7 @@
 $:.unshift(File.expand_path(File.dirname(__FILE__) + "/../../lib"))
 require 'hudson.rb'
 require 'bundler/setup'
+require 'ap'
 
 Before do
   @tmp_root = File.dirname(__FILE__) + "/../../tmp"

data/hudson.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hudson}
-  s.version = "0.3.0.beta.12"
+  s.version = "0.3.0.beta.13"
 
   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/api.rb

@@ -73,7 +73,9 @@ module Hudson
         json = get "/api/json"
         cache_base_uri
         json
-      rescue Errno::ECONNREFUSED => e
+      rescue Errno::ECONNREFUSED
+        false
+      rescue Errno::EAFNOSUPPORT
         false
       end
     end
@@ -84,7 +86,9 @@ module Hudson
         json = get "/job/#{name}/api/json"
         cache_base_uri
         json
-      rescue Errno::ECONNREFUSED => e
+      rescue Errno::ECONNREFUSED
+        false
+      rescue Errno::EAFNOSUPPORT
         false
       end
     end
@@ -95,6 +99,8 @@ module Hudson
       json
     rescue Errno::ECONNREFUSED => e
       false
+    rescue Errno::EAFNOSUPPORT
+      false
     end
 
     # Adds SSH nodes only, for now

data/lib/hudson/version.rb

@@ -1,3 +1,3 @@
 module Hudson
-  VERSION = "0.3.0.beta.12"
+  VERSION = "0.3.0.beta.13"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: hudson
 version: !ruby/object:Gem::Version 
-  hash: 62196363
+  hash: 62196361
   prerelease: true
   segments: 
   - 0
   - 3
   - 0
   - beta
-  - 12
-  version: 0.3.0.beta.12
+  - 13
+  version: 0.3.0.beta.13
 platform: ruby
 authors: 
 - Charles Lowell