hudson 0.3.0.beta.7 → 0.3.0.beta.8

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    hudson (0.3.0.beta.7)
+    hudson (0.3.0.beta.8)
       builder (~> 2.1.2)
       hpricot
-      httparty (~> 0.5.2)
+      httparty (~> 0.6.1)
       term-ansicolor (>= 1.0.4)
       thor (= 0.14.2)
       yajl-ruby (>= 0.7.6)
@@ -14,7 +14,7 @@ GEM
   specs:
     awesome_print (0.2.1)
     builder (2.1.2)
-    crack (0.1.6)
+    crack (0.1.8)
     cucumber (0.9.3)
       builder (~> 2.1.2)
       diff-lcs (~> 1.1.2)
@@ -26,8 +26,8 @@ GEM
       json (~> 1.4.6)
       term-ansicolor (~> 1.0.5)
     hpricot (0.8.2)
-    httparty (0.5.2)
-      crack (= 0.1.6)
+    httparty (0.6.1)
+      crack (= 0.1.8)
     json (1.4.6)
     rake (0.8.7)
     rspec (2.0.1)
@@ -52,7 +52,7 @@ DEPENDENCIES
   builder (~> 2.1.2)
   cucumber (~> 0.9.0)
   hpricot
-  httparty (~> 0.5.2)
+  httparty (~> 0.6.1)
   hudson!
   json (~> 1.4.0)
   rake (~> 0.8.7)

data/Rakefile

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   end.to_a
   s.add_dependency("term-ansicolor", [">= 1.0.4"])
   s.add_dependency("yajl-ruby", [">= 0.7.6"])
-  s.add_dependency("httparty", ["~> 0.5.2"])
+  s.add_dependency("httparty", ["~> 0.6.1"])
   s.add_dependency("builder", ["~> 2.1.2"])
   s.add_dependency("thor", ["= 0.14.2"])
   s.add_dependency("hpricot")

data/hudson.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hudson}
-  s.version = "0.3.0.beta.7"
+  s.version = "0.3.0.beta.8"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Charles Lowell", "Dr Nic Williams"]
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<term-ansicolor>, [">= 1.0.4"])
       s.add_runtime_dependency(%q<yajl-ruby>, [">= 0.7.6"])
-      s.add_runtime_dependency(%q<httparty>, ["~> 0.5.2"])
+      s.add_runtime_dependency(%q<httparty>, ["~> 0.6.1"])
       s.add_runtime_dependency(%q<builder>, ["~> 2.1.2"])
       s.add_runtime_dependency(%q<thor>, ["= 0.14.2"])
       s.add_runtime_dependency(%q<hpricot>, [">= 0"])
@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<term-ansicolor>, [">= 1.0.4"])
       s.add_dependency(%q<yajl-ruby>, [">= 0.7.6"])
-      s.add_dependency(%q<httparty>, ["~> 0.5.2"])
+      s.add_dependency(%q<httparty>, ["~> 0.6.1"])
       s.add_dependency(%q<builder>, ["~> 2.1.2"])
       s.add_dependency(%q<thor>, ["= 0.14.2"])
       s.add_dependency(%q<hpricot>, [">= 0"])
@@ -50,7 +50,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<term-ansicolor>, [">= 1.0.4"])
     s.add_dependency(%q<yajl-ruby>, [">= 0.7.6"])
-    s.add_dependency(%q<httparty>, ["~> 0.5.2"])
+    s.add_dependency(%q<httparty>, ["~> 0.6.1"])
     s.add_dependency(%q<builder>, ["~> 2.1.2"])
     s.add_dependency(%q<thor>, ["= 0.14.2"])
     s.add_dependency(%q<hpricot>, [">= 0"])

data/lib/hudson.rb

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

@@ -11,7 +11,7 @@ module Hudson
 
     headers 'content-type' => 'application/json'
     format :json
-    # http_proxy 'localhost', '8888'
+    http_proxy 'localhost', '8888'
     
     JobAlreadyExistsError = Class.new(Exception)
 
@@ -36,31 +36,26 @@ module Hudson
     #
     # TODO Exceptions?
     def self.create_job(name, job_config, options = {})
-      res = post "/createItem/api/xml?name=#{CGI.escape(name)}", {
-        :body => job_config.to_xml, :format => :xml, :headers => { 'content-type' => 'application/xml' }
-      }
-      if res.code == 200
-        cache_base_uri
-        true
-      else
+      delete_job(name) if options[:override]
+      begin
+        res = post "/createItem/api/xml?name=#{CGI.escape(name)}", {
+          :body => job_config.to_xml, :format => :xml, :headers => { 'content-type' => 'application/xml' }
+        }
         p res.code
-        if res.body =~ /A job already exists with the name/
-          if options[:override]
-            delete_job(name)
-            return create_job(name, job_config)
-          else
-            raise JobAlreadyExistsError.new(name)
-          end
+        puts res.body
+        if res.code == 200
+          cache_base_uri
+          true
         else
+          # TODO - what are the errors we get?
           puts "Server error:"
-          begin
-            require "hpricot"
-            puts Hpricot(res.body).search("//body").text
-          rescue
-            puts res.body
-          end
+          p res.code
+          puts res.body
+          false
         end
-        false
+      rescue REXML::ParseException => e
+        # For some reason, if the job exists we get back half a page of HTML
+        raise JobAlreadyExistsError.new(name)
       end
     end
     

data/lib/hudson/cli.rb

@@ -55,16 +55,18 @@ 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|
-          c.scm = scm.url
-        end
+        job_config = Hudson::JobConfigBuilder.new(:rubygem) { |c| c.scm = scm.url }
         name = File.basename(FileUtils.pwd)
-        if Hudson::Api.create_job(name, job_config, {:override => options[:override]})
-          build_url = "#{@uri}/job/#{name.gsub(/\s/,'%20')}/build"
-          puts "Added project '#{name}' to Hudson."
-          puts "Trigger builds via: #{build_url}"
-        else
-          error "Failed to create project '#{name}'"
+        begin
+          if Hudson::Api.create_job(name, job_config, options)
+            build_url = "#{@uri}/job/#{name.gsub(/\s/,'%20')}/build"
+            puts "Added project '#{name}' to Hudson."
+            puts "Trigger builds via: #{build_url}"
+          else
+            error "Failed to create project '#{name}'"
+          end
+        rescue Hudson::Api::JobAlreadyExistsError
+          error "Job '#{name} already exists."
         end
       end
     end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: hudson
 version: !ruby/object:Gem::Version 
-  hash: 62196381
+  hash: 62196355
   prerelease: true
   segments: 
   - 0
   - 3
   - 0
   - beta
-  - 7
-  version: 0.3.0.beta.7
+  - 8
+  version: 0.3.0.beta.8
 platform: ruby
 authors: 
 - Charles Lowell
@@ -59,12 +59,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 5
         segments: 
         - 0
-        - 5
-        - 2
-        version: 0.5.2
+        - 6
+        - 1
+        version: 0.6.1
   type: :runtime
   prerelease: false
   name: httparty